Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aee8955c authored by Stuart Scott's avatar Stuart Scott Committed by Android (Google) Code Review
Browse files

Merge topic 'ksd-to-lmp-sprout-dev' into lmp-sprout-dev 

* changes:
  [DS] Response fail instead of not response at all
  Bluetooth sub selection
parents 78085407 e25106a2

src/com/android/bluetooth/hfp/HeadsetPhoneState.java

+3 −4
Original line number Diff line number Diff line
@@ -123,11 +123,10 @@ class HeadsetPhoneState extends BroadcastReceiver{ 
    private void startListenForPhoneState() {

        if (!mListening && mSlcReady) {



            // SUB selection, use sim1 always

            long[] subs = SubscriptionManager.getSubId(PhoneConstants.SIM_ID_1);

            long subId = SubscriptionManager.getDefaultSubId();



            if (subs != null && subs[0] >= 0) {

                mPhoneStateListener = getPhoneStateListener(subs[0]);

            if (SubscriptionManager.isValidSubId(subId)) {

                mPhoneStateListener = getPhoneStateListener(subId);



                mTelephonyManager.listen(mPhoneStateListener,

                                         PhoneStateListener.LISTEN_SERVICE_STATE |

src/com/android/bluetooth/hfp/HeadsetStateMachine.java

100755 → 100644
+7 −3
Original line number Diff line number Diff line
@@ -2701,6 +2701,10 @@ final class HeadsetStateMachine extends StateMachine { 
                                                ",,4", getByteAddress(device));

                    atResponseCodeNative(HeadsetHalConstants.AT_RESPONSE_OK,

                                                0, getByteAddress(device));

                } else {

                    Log.e(TAG, "getSubscriberNumber returns null");

                    atResponseCodeNative(HeadsetHalConstants.AT_RESPONSE_ERROR,

                                                0, getByteAddress(device));

                }

            } catch (RemoteException e) {

                Log.e(TAG, Log.getStackTraceString(new Throwable()));