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

Commit a82788f5 authored by Bonian Chen's avatar Bonian Chen Committed by Android (Google) Code Review
Browse files

Merge "[Settings] Remove null checking for TelephonyManager"

parents 709e805e ec344c60

src/com/android/settings/network/ApnSettings.java

+0 −3
Original line number Diff line number Diff line
@@ -174,9 +174,6 @@ public class ApnSettings extends RestrictedSettingsFragment 


        final TelephonyManager updatedTelephonyManager =

                mTelephonyManager.createForSubscriptionId(subId);

        if (updatedTelephonyManager == null) {

            return;

        }



        // restart monitoring when subscription has been changed

        mTelephonyManager.listen(mPhoneStateListener,

src/com/android/settings/network/SubscriptionUtil.java

+2 −3
Original line number Diff line number Diff line
@@ -278,12 +278,11 @@ public class SubscriptionUtil { 
     * Get phoneId or logical slot index for a subId if active, or INVALID_PHONE_INDEX if inactive.

     */

    public static int getPhoneId(Context context, int subId) {

        SubscriptionManager subManager = (SubscriptionManager)

                context.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);

        final SubscriptionManager subManager = context.getSystemService(SubscriptionManager.class);

        if (subManager == null) {

            return INVALID_SIM_SLOT_INDEX;

        }

        SubscriptionInfo info = subManager.getActiveSubscriptionInfo(subId);

        final SubscriptionInfo info = subManager.getActiveSubscriptionInfo(subId);

        if (info == null) {

            return INVALID_SIM_SLOT_INDEX;

        }