commit dc82f0a0eea3c8566f916a94a85e2027e557101c
author Bonian Chen <bonianchen@google.com> Mon Feb 13 12:37:45 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 13 12:37:45 2023 +0000
tree fc3e2680006c188547f07f40c6f5847bedb97076
parent dce72966fb7e975f094052b94cb89fb8ec4820d9
parent 6fa898d709f204763ddc099cf7d9b7f395819e0c

Merge "[Settings] Avoid from Guest user to access UI which requires permission for changing mobile networi configurations"

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

diff --git a/src/com/android/settings/network/EraseEuiccDataController.java b/src/com/android/settings/network/EraseEuiccDataController.java
index 091b6d7..3dc3ab5 100644
--- a/src/com/android/settings/network/EraseEuiccDataController.java
+++ b/src/com/android/settings/network/EraseEuiccDataController.java
@@ -24,6 +24,7 @@
 
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.network.telephony.MobileNetworkUtils;
 import com.android.settings.system.ResetDashboardFragment;
 
 /**
@@ -52,6 +53,7 @@
     @Override
     public int getAvailabilityStatus() {
         return SubscriptionUtil.isSimHardwareVisible(mContext) &&
+                (!MobileNetworkUtils.isMobileNetworkUserRestricted(mContext)) &&
                 mContext.getPackageManager().hasSystemFeature(
                 PackageManager.FEATURE_TELEPHONY_EUICC) ? AVAILABLE_UNSEARCHABLE
                 : UNSUPPORTED_ON_DEVICE;

src/com/android/settings/security/ConfirmSimDeletionPreferenceController.java

diff --git a/src/com/android/settings/security/ConfirmSimDeletionPreferenceController.java b/src/com/android/settings/security/ConfirmSimDeletionPreferenceController.java
index 3bf1563..2712a02 100644
--- a/src/com/android/settings/security/ConfirmSimDeletionPreferenceController.java
+++ b/src/com/android/settings/security/ConfirmSimDeletionPreferenceController.java
@@ -57,7 +57,8 @@
     @Override
     public int getAvailabilityStatus() {
         // hide if eSim is not supported on the device
-        return MobileNetworkUtils.showEuiccSettings(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return (!MobileNetworkUtils.isMobileNetworkUserRestricted(mContext)) &&
+                MobileNetworkUtils.showEuiccSettings(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     private boolean getGlobalState() {