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

Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev am: 98f83d6129

Browse Source 
am: 1b1e9928ab

Change-Id: I460c2575a83d0d2ea8d4e4108b2eb40748a16a91
This commit is contained in:
Jeff Davidson
2017-07-14 01:11:41 +00:00
committed by android-build-merger
parent 7eee73a0c8 1b1e9928ab
commit 0c716a748a
2 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/MasterClear.java
View File

@@ -247,9 +247,8 @@ public class MasterClear extends OptionsMenuFragment
/**
* Whether to show the checkbox to wipe the eUICC.
*
* <p>We show the checkbox on any device which supports eUICC as long as either the eUICC was
* ever provisioned (that is, at least one profile was ever downloaded onto it), or if the user
* has enabled development mode.
* <p>We show the checkbox on any device which supports eUICC as long as the eUICC was ever
* provisioned (that is, at least one profile was ever downloaded onto it).
*/
@VisibleForTesting
boolean showWipeEuicc() {
@@ -258,8 +257,7 @@ public class MasterClear extends OptionsMenuFragment
return false;
}
ContentResolver cr = context.getContentResolver();
return Settings.Global.getInt(cr, Settings.Global.EUICC_PROVISIONED, 0) != 0
|| Settings.Global.getInt(cr, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
return Settings.Global.getInt(cr, Settings.Global.EUICC_PROVISIONED, 0) != 0;
}
@VisibleForTesting