diff --git a/app/src/main/java/com/termux/api/AudioAPI.java b/app/src/main/java/com/termux/api/AudioAPI.java
index 51a4c7b7d..0e30c5b83 100644
--- a/app/src/main/java/com/termux/api/AudioAPI.java
+++ b/app/src/main/java/com/termux/api/AudioAPI.java
@@ -4,35 +4,87 @@
 import android.content.Intent;
 import android.media.AudioManager;
 import android.util.JsonWriter;
-import android.media.AudioTrack; 
+import android.media.AudioTrack;
+import android.media.AudioFormat;
+import android.media.AudioAttributes;
+import android.os.Build;
 
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.ResultReturner.ResultWriter;
 
-
-
 public class AudioAPI {
     static void onReceive(TermuxApiReceiver apiReceiver, final Context context, Intent intent) {
-	ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultJsonWriter() {
-	    
-	    AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-	    String SampleRate = am.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE);
-	    String framesPerBuffer = am.getProperty(AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER);
-	    String AudioUnprocessed = am.getProperty(AudioManager.PROPERTY_SUPPORT_AUDIO_SOURCE_UNPROCESSED);
-	    int nativeoutput = AudioTrack.getNativeOutputSampleRate(AudioManager.STREAM_MUSIC); 
-	    int volume_level= am.getStreamVolume(AudioManager.STREAM_MUSIC);
-	    int maxvolume_level = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
-	    public void writeJson(JsonWriter out) throws Exception {
-		out.beginObject(); 
-		out.name("PROPERTY_OUTPUT_SAMPLE_RATE").value(SampleRate);
-		out.name("PROPERTY_OUTPUT_FRAMES_PER_BUFFER").value(framesPerBuffer);
-		out.name("PROPERTY_SUPPORT_AUDIO_SOURCE_UNPROCESSED").value(AudioUnprocessed);
-		out.name("STREAM_MUSIC_VOLUME").value(volume_level);
-		out.name("STREAM_MUSIC_MAXVOLUME").value(maxvolume_level);
-		out.name("CURRENT_NATIVE_OUTPUT_SAMPLERATE").value(nativeoutput);
+        AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+	AudioTrack at = new AudioTrack (
+                new AudioAttributes.Builder()
+                .setFlags(256) // FLAG_LOW_LATENCY
+                .build(),
+                new AudioFormat.Builder()
+                .build(),
+                4, // bytes; i.e. one 16bit 2ch frame
+                AudioTrack.MODE_STREAM,
+                AudioManager.AUDIO_SESSION_ID_GENERATE
+        );
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+	final String SampleRate = am.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE);
+	final String framesPerBuffer = am.getProperty(AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER);
+	final String AudioUnprocessed = am.getProperty(AudioManager.PROPERTY_SUPPORT_AUDIO_SOURCE_UNPROCESSED);
+	final int nativeoutput = AudioTrack.getNativeOutputSampleRate(AudioManager.STREAM_MUSIC);
+	final int volume_level= am.getStreamVolume(AudioManager.STREAM_MUSIC);
+	final int maxvolume_level = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+/*	final int bc = at.getBufferCapacityInFrames(); only available api 24 and up and is always returns same value as
+ *	the initial getbuffersizeinframes */
+	final int bs = at.getBufferSizeInFrames();
+	final boolean bluetootha2dp = am.isBluetoothA2dpOn();
+        final boolean wiredhs = am.isWiredHeadsetOn();
+	at.release();
+
+        ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultJsonWriter() {
+            public void writeJson(JsonWriter out) throws Exception {
+                out.beginObject();
+                out.name("PROPERTY_OUTPUT_SAMPLE_RATE").value(SampleRate);
+                out.name("PROPERTY_OUTPUT_FRAMES_PER_BUFFER").value(framesPerBuffer);
+                out.name("PROPERTY_SUPPORT_AUDIO_SOURCE_UNPROCESSED").value(AudioUnprocessed);
+                out.name("STREAM_MUSIC_VOLUME").value(volume_level);
+                out.name("STREAM_MUSIC_MAXVOLUME").value(maxvolume_level);
+                out.name("CURRENT_NATIVE_OUTPUT_SAMPLERATE").value(nativeoutput);
+                out.name("AUDIOTRACK_BUFFER_SIZE_IN_FRAMES").value(bs);
+		out.name("BLUETOOTH_A2DP_IS_ON").value(bluetootha2dp);
+                out.name("WIREDHEADSET_IS_CONNECTED").value(wiredhs);
 		out.endObject();
-		}
-	});
+                }
+        });
+	}
+if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+	final String SampleRate = am.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE);
+	final String framesPerBuffer = am.getProperty(AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER);
+	final String AudioUnprocessed = am.getProperty(AudioManager.PROPERTY_SUPPORT_AUDIO_SOURCE_UNPROCESSED);
+	final int nativeoutput = AudioTrack.getNativeOutputSampleRate(AudioManager.STREAM_MUSIC);
+	final int volume_level= am.getStreamVolume(AudioManager.STREAM_MUSIC);
+	final int maxvolume_level = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+	final boolean WiredHs = am.isWiredHeadsetOn();
+        final boolean bluetootha2dp = am.isBluetoothA2dpOn();
+        at.release();
+
+        ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultJsonWriter() {
+            public void writeJson(JsonWriter out) throws Exception {
+                out.beginObject();
+                out.name("PROPERTY_OUTPUT_SAMPLE_RATE").value(SampleRate);
+                out.name("PROPERTY_OUTPUT_FRAMES_PER_BUFFER").value(framesPerBuffer);
+                out.name("PROPERTY_SUPPORT_AUDIO_SOURCE_UNPROCESSED").value(AudioUnprocessed);
+                out.name("STREAM_MUSIC_VOLUME").value(volume_level);
+                out.name("STREAM_MUSIC_MAXVOLUME").value(maxvolume_level);
+                out.name("CURRENT_NATIVE_OUTPUT_SAMPLERATE").value(nativeoutput);
+                out.name("BLUETOOTH_A2DP_IS_ON").value(bluetootha2dp);
+                out.name("WIREDHEADSET_IS_CONNECTED").value(WiredHs);
+		out.endObject();
+                }
+        });
+        }
+ 
+    
+    
+    
+    
     }
 }
-