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

Commit d33fbde0 authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" am: 5125477d 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310159



Change-Id: Ic919498fda4172ede68fcd431b8bdd18056fada6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e4fbf9d9 5125477d

res/xml/network_provider_internet.xml

+0 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
        android:icon="@drawable/ic_calls_sms"

        android:order="-20"

        android:summary="@string/summary_placeholder"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:allowDividerBelow="true"

        settings:keywords="@string/calls_and_sms"

        settings:useAdminDisabledSummary="true" />
@@ -50,7 +49,6 @@ 
        android:order="-15"

        settings:keywords="@string/keywords_more_mobile_networks"

        settings:userRestriction="no_config_mobile_networks"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:allowDividerAbove="true"

        settings:useAdminDisabledSummary="true" />
@@ -68,7 +66,6 @@ 
        android:persistent="false"

        android:order="19"

        settings:userRestriction="no_config_mobile_networks"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:useAdminDisabledSummary="true" />



    <com.android.settingslib.RestrictedPreference

res/xml/network_provider_settings.xml

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
        android:key="provider_model_mobile_network"

        android:title="@string/summary_placeholder"

        android:layout="@layout/preference_category_no_label"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

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



    <com.android.settingslib.RestrictedSwitchPreference

res/xml/reset_dashboard_fragment.xml

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
    <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

+1 −10
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ 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;
@@ -382,14 +381,6 @@ 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.

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

    boolean showWipeEuicc() {

        Context context = getContext();

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

        if (!isEuiccEnabled(context)) {

            return false;

        }

        ContentResolver cr = context.getContentResolver();

src/com/android/settings/ResetNetwork.java

+0 −6
Original line number Diff line number Diff line
@@ -235,9 +235,6 @@ 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");
@@ -267,9 +264,6 @@ public class ResetNetwork extends InstrumentedFragment { 
    }



    private boolean showEuiccSettings(Context context) {

        if (!SubscriptionUtil.isSimHardwareVisible(context)) {

            return false;

        }

        EuiccManager euiccManager =

                (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);

        if (!euiccManager.isEnabled()) {