Revert "Fix can't enable speaker with bluetooth headset"

* Replaced by different upstream fix

This reverts commit 76459f16219514fd973ed169962095221dc15adf.

Change-Id: I7d08eae8b0cf6153cacbc48b65752517b3258d62

2 files changed, 6 insertions, 22 deletions

diff --git a/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java b/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java
index e169338c2..da36f9d4e 100644
--- a/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java
+++ b/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java
@@ -369,8 +369,7 @@ public class ApiHelper {
 
     public static class AudioSystem {
         public static final int FORCE_NONE = 0;
-        public static final int FORCE_SPEAKER_HEADSET = 1;
-        public static final int FORCE_SPEAKER_BT = 10;
+        public static final int FORCE_SPEAKER = 1;
 
         public static final int FOR_MEDIA = 1;
 
diff --git a/src/org/codeaurora/gallery3d/video/SpeakerHooker.java b/src/org/codeaurora/gallery3d/video/SpeakerHooker.java
index c2aebd720..912de96a5 100644
--- a/src/org/codeaurora/gallery3d/video/SpeakerHooker.java
+++ b/src/org/codeaurora/gallery3d/video/SpeakerHooker.java
@@ -28,10 +28,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 package org.codeaurora.gallery3d.video;
 
-import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothProfile;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -156,7 +154,7 @@ public class SpeakerHooker extends MovieHooker {
         if (isSpeakerOn()) {
             turnSpeakerOff();
         } else {
-            if (mIsHeadsetOn || isBtHeadsetConnected()) {
+            if (mIsHeadsetOn) {
                 turnSpeakerOn();
             } else {
                 Toast.makeText(getContext(), getContext().getString(R.string.speaker_need_headset),
@@ -166,25 +164,12 @@ public class SpeakerHooker extends MovieHooker {
         updateSpeakerButton();
     }
 
-    private boolean isBtHeadsetConnected() {
-        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-        if (adapter != null) {
-            if (BluetoothProfile.STATE_CONNECTED ==
-                    adapter.getProfileConnectionState(BluetoothProfile.HEADSET) ||
-                    BluetoothProfile.STATE_CONNECTED ==
-                            adapter.getProfileConnectionState(BluetoothProfile.A2DP)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     private void turnSpeakerOn() {
         if (mAudioManager == null) {
             initAudioManager();
         }
-        AudioSystem.setForceUse(AudioSystem.FOR_MEDIA, isBtHeadsetConnected() ?
-                AudioSystem.FORCE_SPEAKER_BT : AudioSystem.FORCE_SPEAKER_HEADSET);
+        AudioSystem.setForceUse(AudioSystem.FOR_MEDIA,
+                AudioSystem.FORCE_SPEAKER);
     }
 
     private void turnSpeakerOff() {
@@ -213,8 +198,8 @@ public class SpeakerHooker extends MovieHooker {
     }
 
     private boolean isSpeakerOn() {
-        return (AudioSystem.FORCE_SPEAKER_HEADSET == AudioSystem.getForceUse(AudioSystem.FOR_MEDIA)
-                || AudioSystem.FORCE_SPEAKER_BT == AudioSystem.getForceUse(AudioSystem.FOR_MEDIA));
+        return (AudioSystem.FORCE_SPEAKER
+                == AudioSystem.getForceUse(AudioSystem.FOR_MEDIA));
     }
 
 }