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

Commit cda77d70 authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Change to getSubscriptionId am: 0c6fe60c am: 50c4ca28 

am: a89bb835

Change-Id: I0942373f694fe0d9b7443e302269305681a3b545
parents cf2b0140 a89bb835

src/com/android/server/telecom/CreateConnectionProcessor.java

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public class CreateConnectionProcessor implements CreateConnectionResponse { 
            if (manager == null) {

                return SubscriptionManager.INVALID_SUBSCRIPTION_ID;

            }

            return manager.getSubIdForPhoneAccountHandle(account.getAccountHandle());

            return manager.getSubscriptionId(account.getAccountHandle());

        }



        @Override

src/com/android/server/telecom/PhoneAccountRegistrar.java

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ public class PhoneAccountRegistrar { 
        if (account != null && account.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {

            TelephonyManager tm =

                    (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);

            return tm.getSubIdForPhoneAccountHandle(accountHandle);

            return tm.getSubscriptionId(accountHandle);

        }

        return SubscriptionManager.INVALID_SUBSCRIPTION_ID;

    }

tests/src/com/android/server/telecom/tests/ComponentContextFixture.java

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ public class ComponentContextFixture implements TestFixture<Context> { 
        // Used in CreateConnectionProcessor to rank emergency numbers by viability.

        // For the test, make them all equal to INVALID so that the preferred PhoneAccount will be

        // chosen.

        when(mTelephonyManager.getSubIdForPhoneAccountHandle(any())).thenReturn(

        when(mTelephonyManager.getSubscriptionId(any())).thenReturn(

                SubscriptionManager.INVALID_SUBSCRIPTION_ID);



        when(mTelephonyManager.getNetworkOperatorName()).thenReturn("label1");