PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08 am: ad49e33f01 am: c200d097e9

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

Change-Id: I53046b290eebcfc8647f19e66539dbb84f34afee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-10-20 10:12:38 +00:00
committed by Automerger Merge Worker
parent 9031f9f876 c200d097e9
commit f7f2f0600b
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/network/EraseEuiccDataController.java
View File

@@ -18,10 +18,12 @@ package com.android.settings.network;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.UserManager;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.network.telephony.MobileNetworkUtils; import com.android.settings.network.telephony.MobileNetworkUtils;
@@ -33,8 +35,11 @@ import com.android.settings.system.ResetDashboardFragment;
public class EraseEuiccDataController extends BasePreferenceController { public class EraseEuiccDataController extends BasePreferenceController {
private ResetDashboardFragment mHostFragment; private ResetDashboardFragment mHostFragment;
private final UserManager mUm;
public EraseEuiccDataController(Context context, String preferenceKey) { public EraseEuiccDataController(Context context, String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
mUm = context.getSystemService(UserManager.class);
} }
public void setFragment(ResetDashboardFragment hostFragment) { public void setFragment(ResetDashboardFragment hostFragment) {
@@ -52,10 +57,12 @@ public class EraseEuiccDataController extends BasePreferenceController {
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return SubscriptionUtil.isSimHardwareVisible(mContext) && boolean isAllowedUser = (mUm.isAdminUser() || Utils.isDemoUser(mContext))
(!MobileNetworkUtils.isMobileNetworkUserRestricted(mContext)) && && !MobileNetworkUtils.isMobileNetworkUserRestricted(mContext);
mContext.getPackageManager().hasSystemFeature( boolean hasEuiccFeature = mContext.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_TELEPHONY_EUICC) ? AVAILABLE_UNSEARCHABLE PackageManager.FEATURE_TELEPHONY_EUICC);
: UNSUPPORTED_ON_DEVICE; return SubscriptionUtil.isSimHardwareVisible(mContext)
&& isAllowedUser
&& hasEuiccFeature ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
} }
} }