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

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

Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev

parents ab2e7bf6 a964b09c

res/xml/reset_dashboard_fragment.xml

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
    <Preference

        android:key="erase_euicc_data"

        android:title="@string/reset_esim_title"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:controller="com.android.settings.network.EraseEuiccDataController" />



    <!-- Factory reset -->

src/com/android/settings/MainClear.java

+10 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import androidx.annotation.VisibleForTesting; 


import com.android.settings.core.InstrumentedFragment;

import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;

import com.android.settings.network.SubscriptionUtil;

import com.android.settings.password.ChooseLockSettingsHelper;

import com.android.settings.password.ConfirmLockPattern;

import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -381,6 +382,14 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis 
        mScrollView.getViewTreeObserver().addOnGlobalLayoutListener(this);

    }



    /**

     * Whether to show any UI which is SIM related.

     */

    @VisibleForTesting

    boolean showAnySubscriptionInfo(Context context) {

        return (context != null) && SubscriptionUtil.isSimHardwareVisible(context);

    }



    /**

     * Whether to show strings indicating that the eUICC will be wiped.

     *
@@ -390,7 +399,7 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis 
    @VisibleForTesting

    boolean showWipeEuicc() {

        Context context = getContext();

        if (!isEuiccEnabled(context)) {

        if (!showAnySubscriptionInfo(context) || !isEuiccEnabled(context)) {

            return false;

        }

        ContentResolver cr = context.getContentResolver();

src/com/android/settings/ResetNetwork.java

+3 −0
Original line number Diff line number Diff line
@@ -239,6 +239,9 @@ public class ResetNetwork extends InstrumentedFragment { 
    }



    private List<SubscriptionInfo> getActiveSubscriptionInfoList() {

        if (!SubscriptionUtil.isSimHardwareVisible(getActivity())) {

            return Collections.emptyList();

        }

        SubscriptionManager mgr = getActivity().getSystemService(SubscriptionManager.class);

        if (mgr == null) {

            Log.w(TAG, "No SubscriptionManager");

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

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ public class EraseEuiccDataController extends BasePreferenceController { 


    @Override

    public int getAvailabilityStatus() {

        return mContext.getPackageManager().hasSystemFeature(

        return SubscriptionUtil.isSimHardwareVisible(mContext) &&

                mContext.getPackageManager().hasSystemFeature(

                PackageManager.FEATURE_TELEPHONY_EUICC) ? AVAILABLE_UNSEARCHABLE

                : UNSUPPORTED_ON_DEVICE;

    }

tests/robotests/src/com/android/settings/MainClearTest.java

+4 −1
Original line number Diff line number Diff line
@@ -102,7 +102,10 @@ public class MainClearTest { 
    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mMainClear = spy(new MainClear());

        mMainClear = spy(new MainClear() {

            @Override

            boolean showAnySubscriptionInfo(Context context) { return true; }

        });

        mActivity = Robolectric.setupActivity(FragmentActivity.class);

        mShadowActivity = Shadows.shadowOf(mActivity);

        UserManager userManager = mActivity.getSystemService(UserManager.class);