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

Commit e0f40d59 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Android (Google) Code Review
Browse files

Merge "Mainline: remove usage of hiddepn API SubscriptionManager#getPhoneId"

parents 93b2bfe3 26e5dbdb

src/com/android/settings/ResetNetworkConfirm.java

+2 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import com.android.internal.telephony.PhoneConstants; 
import com.android.settings.core.InstrumentedFragment;

import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;

import com.android.settings.network.ApnSettings;

import com.android.settings.network.SubscriptionUtil;

import com.android.settingslib.RestrictedLockUtilsInternal;



/**
@@ -126,7 +127,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment { 
            }



            ImsManager.getInstance(mContext,

                    SubscriptionManager.getPhoneId(mSubId)).factoryReset();

                    SubscriptionUtil.getPhoneId(mContext, mSubId)).factoryReset();

            restoreDefaultApn(mContext);

            if (mEraseEsim) {

                return RecoverySystem.wipeEuiccData(mContext, mPackageName);

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

+4 −4
Original line number Diff line number Diff line
@@ -152,9 +152,9 @@ public class ApnSettings extends RestrictedSettingsFragment 
                if (!mRestoreDefaultApnMode) {

                    int extraSubId = intent.getIntExtra(TelephonyManager.EXTRA_SUBSCRIPTION_ID,

                            SubscriptionManager.INVALID_SUBSCRIPTION_ID);

                    if (SubscriptionManager.isValidSubscriptionId(extraSubId) &&

                            mPhoneId == SubscriptionManager.getPhoneId(extraSubId) &&

                            extraSubId != mSubId) {

                    if (SubscriptionManager.isValidSubscriptionId(extraSubId)

                            && mPhoneId == SubscriptionUtil.getPhoneId(context, extraSubId)

                            && extraSubId != mSubId) {

                        // subscription has changed

                        mSubId = extraSubId;

                        mSubscriptionInfo = getSubscriptionInfo(mSubId);
@@ -185,7 +185,7 @@ public class ApnSettings extends RestrictedSettingsFragment 
        final Activity activity = getActivity();

        mSubId = activity.getIntent().getIntExtra(SUB_ID,

                SubscriptionManager.INVALID_SUBSCRIPTION_ID);

        mPhoneId = SubscriptionManager.getPhoneId(mSubId);

        mPhoneId = SubscriptionUtil.getPhoneId(activity, mSubId);

        mIntentFilter = new IntentFilter(

                TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);

        mIntentFilter.addAction(TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED);

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

+17 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings.network;



import static android.telephony.SubscriptionManager.INVALID_SIM_SLOT_INDEX;

import static android.telephony.UiccSlotInfo.CARD_STATE_INFO_PRESENT;



import static com.android.internal.util.CollectionUtils.emptyIfNull;
@@ -120,4 +121,20 @@ public class SubscriptionUtil { 
    public static boolean showToggleForPhysicalSim(SubscriptionManager subMgr) {

        return subMgr.canDisablePhysicalSubscription();

    }



    /**

     * 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);

        if (subManager == null) {

            return INVALID_SIM_SLOT_INDEX;

        }

        SubscriptionInfo info = subManager.getActiveSubscriptionInfo(subId);

        if (info == null) {

            return INVALID_SIM_SLOT_INDEX;

        }

        return info.getSimSlotIndex();

    }

}

src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java

+3 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import androidx.preference.PreferenceScreen; 
import androidx.preference.SwitchPreference;



import com.android.ims.ImsManager;

import com.android.settings.network.SubscriptionUtil;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnStart;

import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -75,7 +76,8 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc 
        mSubId = subId;

        mCarrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);

        if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

            mImsManager = ImsManager.getInstance(mContext, SubscriptionManager.getPhoneId(mSubId));

            mImsManager = ImsManager.getInstance(mContext, SubscriptionUtil.getPhoneId(

                    mContext, mSubId));

        }



        final boolean show4GForLTE = mCarrierConfig.getBoolean(

src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java

+2 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import androidx.slice.builders.SliceAction; 
import com.android.ims.ImsManager;

import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.network.SubscriptionUtil;

import com.android.settings.slices.CustomSliceRegistry;

import com.android.settings.slices.SliceBroadcastReceiver;
@@ -188,7 +189,7 @@ public class Enhanced4gLteSliceHelper { 
    }



    protected ImsManager getImsManager(int subId) {

        return ImsManager.getInstance(mContext, SubscriptionManager.getPhoneId(subId));

        return ImsManager.getInstance(mContext, SubscriptionUtil.getPhoneId(mContext, subId));

    }



    @VisibleForTesting