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

Move logic for FR in demo mode out of Settings

Browse Source 
Bug: 62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc
This commit is contained in:
Christine Franks
2017-06-23 14:28:21 -07:00
parent 50ac1cebc3
commit c6890ab6c5
9 changed files with 59 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/system/FactoryResetPreferenceController.java
View File

@@ -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