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

Commit ce1dad8c authored Sep 17, 2014 by Stuart Scott Committed by Android Git Automerger Sep 17, 2014

am 6abc964b: am 70ba30b0: am d2f6ff6c: Merge topic \'ksd-to-lmp-sprout-dev\' into lmp-sprout-dev

* commit '6abc964b':
  [DS] Response fail instead of not response at all
  Bluetooth sub selection

parents 1c6446f6 6abc964b

android/app/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 \|

android/app/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()));