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

Commit 3835293a authored by Zoey Chen's avatar Zoey Chen Committed by android-build-merger
Browse files

Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId" 

am: 047dd2df

Change-Id: Ia665022e1d3357f68109905f976b84e89f66c045
parents 22c2c146 047dd2df

src/com/android/settings/sim/CallsSimListDialogFragment.java

+1 −2
Original line number Diff line number Diff line
@@ -47,8 +47,7 @@ public class CallsSimListDialogFragment extends SimListDialogFragment { 
            return result;

        }

        for (PhoneAccountHandle handle : phoneAccounts) {

            final PhoneAccount phoneAccount = telecomManager.getPhoneAccount(handle);

            final int subId = telephonyManager.getSubIdForPhoneAccount(phoneAccount);

            final int subId = telephonyManager.getSubscriptionId(handle);



            if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

                continue;

src/com/android/settings/sim/SimDialogActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -176,8 +176,7 @@ public class SimDialogActivity extends FragmentActivity { 
        final TelephonyManager telephonyManager = getSystemService(TelephonyManager.class);



        for (PhoneAccountHandle handle : telecomManager.getCallCapablePhoneAccounts()) {

            final PhoneAccount phoneAccount = telecomManager.getPhoneAccount(handle);

            if (subId == telephonyManager.getSubIdForPhoneAccount(phoneAccount)) {

            if (subId == telephonyManager.getSubscriptionId(handle)) {

                return handle;

            }

        }