Revert "Bluetooth: Disconnect SCO for In-Band Ringtone."staging/cm-13.0+r22

This reverts commit 9aa4ca7ab542b8ac306396eddf387e35e39cec3a.

Change-Id: If4042b4d78382290bf796ac4d8399174cc814a59

2 files changed, 0 insertions, 123 deletions

diff --git a/jni/com_android_bluetooth_hfpclient.cpp b/jni/com_android_bluetooth_hfpclient.cpp
index cd79b510f..eaf004b3f 100644
--- a/jni/com_android_bluetooth_hfpclient.cpp
+++ b/jni/com_android_bluetooth_hfpclient.cpp
@@ -56,8 +56,6 @@ static jmethodID method_onSubscriberInfo;
 static jmethodID method_onInBandRing;
 static jmethodID method_onLastVoiceTagNumber;
 static jmethodID method_onRingIndication;
-static jmethodID method_onCgmi;
-static jmethodID method_onCgmm;
 
 static bool checkCallbackThread() {
     // Always fetch the latest callbackEnv from AdapterService.
@@ -253,28 +251,6 @@ static void ring_indication_cb () {
     checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);
 }
 
-static void cgmi_cb (const char *str) {
-    jstring js_manf_id;
-
-    CHECK_CALLBACK_ENV
-
-    js_manf_id = sCallbackEnv->NewStringUTF(str);
-    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onCgmi, js_manf_id);
-    checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);
-    sCallbackEnv->DeleteLocalRef(js_manf_id);
-}
-
-static void cgmm_cb (const char *str) {
-    jstring js_manf_model;
-
-    CHECK_CALLBACK_ENV
-
-    js_manf_model = sCallbackEnv->NewStringUTF(str);
-    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onCgmm, js_manf_model);
-    checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);
-    sCallbackEnv->DeleteLocalRef(js_manf_model);
-}
-
 static bthf_client_callbacks_t sBluetoothHfpClientCallbacks = {
     sizeof(sBluetoothHfpClientCallbacks),
     connection_state_cb,
@@ -298,8 +274,6 @@ static bthf_client_callbacks_t sBluetoothHfpClientCallbacks = {
     in_band_ring_cb,
     last_voice_tag_number_cb,
     ring_indication_cb,
-    cgmi_cb,
-    cgmm_cb,
 };
 
 static void classInitNative(JNIEnv* env, jclass clazz) {
@@ -325,8 +299,6 @@ static void classInitNative(JNIEnv* env, jclass clazz) {
     method_onLastVoiceTagNumber = env->GetMethodID(clazz, "onLastVoiceTagNumber",
         "(Ljava/lang/String;)V");
     method_onRingIndication = env->GetMethodID(clazz, "onRingIndication","()V");
-    method_onCgmi = env->GetMethodID(clazz, "onCgmi","(Ljava/lang/String;)V");
-    method_onCgmm = env->GetMethodID(clazz, "onCgmm","(Ljava/lang/String;)V");
 
     ALOGI("%s succeeds", __FUNCTION__);
 }
diff --git a/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java b/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
index 751be53fe..6543794ab 100644
--- a/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
+++ b/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
@@ -1454,8 +1454,6 @@ final class HeadsetClientStateMachine extends StateMachine {
                         case EVENT_TYPE_SUBSCRIBER_INFO:
                         case EVENT_TYPE_CURRENT_CALLS:
                         case EVENT_TYPE_OPERATOR_NAME:
-                        case EVENT_TYPE_CGMI:
-                        case EVENT_TYPE_CGMM:
                         default:
                             Log.e(TAG, "Connecting: ignoring stack event: " + event.type);
                             break;
@@ -1975,24 +1973,6 @@ final class HeadsetClientStateMachine extends StateMachine {
                             break;
                         case EVENT_TYPE_RING_INDICATION:
                             break;
-                        case EVENT_TYPE_CGMI:
-                            Log.d(TAG, "cgmi:" + event.valueString);
-                            // broadcast intent with the string
-                            intent = new Intent(BluetoothHeadsetClient.ACTION_AG_EVENT);
-                            intent.putExtra(BluetoothHeadsetClient.EXTRA_MANF_ID,
-                                     event.valueString);
-                            intent.putExtra(BluetoothDevice.EXTRA_DEVICE, event.device);
-                            mService.sendBroadcast(intent, ProfileService.BLUETOOTH_PERM);
-                            break;
-                        case EVENT_TYPE_CGMM:
-                            Log.d(TAG, "cgmm:" + event.valueString);
-                            // broadcast intent with the string
-                            intent = new Intent(BluetoothHeadsetClient.ACTION_AG_EVENT);
-                            intent.putExtra(BluetoothHeadsetClient.EXTRA_MANF_MODEL,
-                                     event.valueString);
-                            intent.putExtra(BluetoothDevice.EXTRA_DEVICE, event.device);
-                            mService.sendBroadcast(intent, ProfileService.BLUETOOTH_PERM);
-                            break;
                         default:
                             Log.e(TAG, "Unknown stack event: " + event.type);
                             break;
@@ -2019,18 +1999,6 @@ final class HeadsetClientStateMachine extends StateMachine {
         private void processConnectionEvent(int state, BluetoothDevice device) {
             switch (state) {
                 case HeadsetClientHalConstants.CONNECTION_STATE_DISCONNECTED:
-                    if (mRingtone != null && mRingtone.isPlaying()) {
-                        mRingtone.stop();
-                    if (mAudioManager.getMode() ==
-                            AudioManager.MODE_RINGTONE) {
-                        mAudioManager.setMode(AudioManager.MODE_NORMAL);
-                    }
-                    //abandon audio focus
-                    Log.d(TAG, "abandonAudioFocus");
-                    /* abandon audio focus after the mode has
-                     been set back to normal*/
-                    mAudioManager.abandonAudioFocusForCall();
-                    }
                     Log.d(TAG, "Connected disconnects.");
                     // AG disconnects
                     if (mCurrentDevice.equals(device)) {
@@ -2178,7 +2146,6 @@ final class HeadsetClientStateMachine extends StateMachine {
                     }
                     break;
                 case STACK_EVENT:
-                    Intent intent = null;
                     StackEvent event = (StackEvent) message.obj;
                     if (DBG) {
                         Log.d(TAG, "AudioOn: event type: " + event.type);
@@ -2194,50 +2161,6 @@ final class HeadsetClientStateMachine extends StateMachine {
                                     + event.valueInt);
                             processAudioEvent(event.valueInt, event.device);
                             break;
-                        case EVENT_TYPE_RING_INDICATION:
-                            /* PTS test case TC_HF_ICA_BV_05_I creates SCO even
-                             * after disabling in-band ringtone, disconnect SCO
-                             * if inband ringtone is disabled */
-                            Log.i(TAG,"Ring Indication in Audio connected state " +
-                                    "mInBandRingtone " + mInBandRingtone);
-                            if (mInBandRingtone !=
-                                    HeadsetClientHalConstants.IN_BAND_RING_NOT_PROVIDED) {
-                                break;
-                            }
-                            if (disconnectAudioNative(getByteAddress(mCurrentDevice))) {
-                                mAudioState = BluetoothHeadsetClient.STATE_AUDIO_DISCONNECTED;
-                                //abandon audio focus
-                                if (mAudioManager.getMode() != AudioManager.MODE_NORMAL) {
-                                    mAudioManager.setMode(AudioManager.MODE_NORMAL);
-                                    Log.d(TAG, "abandonAudioFocus");
-                                    //abandon audio focus after the mode has been set back to normal
-                                    mAudioManager.abandonAudioFocusForCall();
-                                }
-                                Log.d(TAG,"hfp_enable=false");
-                                mAudioManager.setParameters("hfp_enable=false");
-                                broadcastAudioState(mCurrentDevice,
-                                        BluetoothHeadsetClient.STATE_AUDIO_DISCONNECTED,
-                                        BluetoothHeadsetClient.STATE_AUDIO_CONNECTED);
-                            }
-                            break;
-                        case EVENT_TYPE_CGMI:
-                            Log.d(TAG, "cgmi:" + event.valueString);
-                            // broadcast intent with the string
-                            intent = new Intent(BluetoothHeadsetClient.ACTION_AG_EVENT);
-                            intent.putExtra(BluetoothHeadsetClient.EXTRA_MANF_ID,
-                                     event.valueString);
-                            intent.putExtra(BluetoothDevice.EXTRA_DEVICE, event.device);
-                            mService.sendBroadcast(intent, ProfileService.BLUETOOTH_PERM);
-                            break;
-                        case EVENT_TYPE_CGMM:
-                            Log.d(TAG, "cgmm:" + event.valueString);
-                            // broadcast intent with the string
-                            intent = new Intent(BluetoothHeadsetClient.ACTION_AG_EVENT);
-                            intent.putExtra(BluetoothHeadsetClient.EXTRA_MANF_MODEL,
-                                     event.valueString);
-                            intent.putExtra(BluetoothDevice.EXTRA_DEVICE, event.device);
-                            mService.sendBroadcast(intent, ProfileService.BLUETOOTH_PERM);
-                            break;
                         default:
                             return NOT_HANDLED;
                     }
@@ -2655,20 +2578,6 @@ final class HeadsetClientStateMachine extends StateMachine {
         sendMessage(STACK_EVENT, event);
     }
 
-    private void onCgmi(String manf_id) {
-        StackEvent event = new StackEvent(EVENT_TYPE_CGMI);
-        event.valueString = manf_id;
-        Log.d(TAG, "incoming" + event);
-        sendMessage(STACK_EVENT, event);
-    }
-
-    private void onCgmm(String manf_model) {
-        StackEvent event = new StackEvent(EVENT_TYPE_CGMM);
-        event.valueString = manf_model;
-        Log.d(TAG, "incoming" + event);
-        sendMessage(STACK_EVENT, event);
-    }
-
     private String getCurrentDeviceName() {
         String defaultName = "<unknown>";
         if (mCurrentDevice == null) {
@@ -2708,8 +2617,6 @@ final class HeadsetClientStateMachine extends StateMachine {
     final private static int EVENT_TYPE_IN_BAND_RING = 19;
     final private static int EVENT_TYPE_LAST_VOICE_TAG_NUMBER = 20;
     final private static int EVENT_TYPE_RING_INDICATION= 21;
-    final private static int EVENT_TYPE_CGMI= 22;
-    final private static int EVENT_TYPE_CGMM= 23;
 
     // for debugging only
     private final String EVENT_TYPE_NAMES[] =
@@ -2736,8 +2643,6 @@ final class HeadsetClientStateMachine extends StateMachine {
             "EVENT_TYPE_IN_BAND_RING",
             "EVENT_TYPE_LAST_VOICE_TAG_NUMBER",
             "EVENT_TYPE_RING_INDICATION",
-            "EVENT_TYPE_CGMI",
-            "EVENT_TYPE_CGMM",
     };
 
     private class StackEvent {