diff options
| author | Christine Franks <christyfranks@google.com> | 2017-06-23 14:28:21 -0700 |
|---|---|---|
| committer | Christine Franks <christyfranks@google.com> | 2017-07-21 19:19:19 +0000 |
| commit | c6890ab6c51185ff39d9cbdf48b04d14518b9a27 (patch) | |
| tree | fea411875282694e8646fbb7978be1f11d4fa8fc /src/com/android/settings/system/FactoryResetPreferenceController.java | |
| parent | 50ac1cebc3e8541f81c768e2dccfae63fbc8dfae (diff) | |
| download | packages_apps_Settings-c6890ab6c51185ff39d9cbdf48b04d14518b9a27.tar.gz packages_apps_Settings-c6890ab6c51185ff39d9cbdf48b04d14518b9a27.tar.bz2 packages_apps_Settings-c6890ab6c51185ff39d9cbdf48b04d14518b9a27.zip | |
Move logic for FR in demo mode out of Settings
Bug: 62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc
Diffstat (limited to 'src/com/android/settings/system/FactoryResetPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/system/FactoryResetPreferenceController.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/system/FactoryResetPreferenceController.java b/src/com/android/settings/system/FactoryResetPreferenceController.java index 69eef2a655..7e9773bd77 100644 --- a/src/com/android/settings/system/FactoryResetPreferenceController.java +++ b/src/com/android/settings/system/FactoryResetPreferenceController.java @@ -47,7 +47,7 @@ public class FactoryResetPreferenceController extends AbstractPreferenceControll /** Hide "Factory reset" settings for secondary users, except demo users. */ @Override public boolean isAvailable() { - return mUm.isAdminUser() || Utils.isCarrierDemoUser(mContext); + return mUm.isAdminUser() || Utils.isDemoUser(mContext); } @Override |