Merge "Allow developer options in retail mode" into pi-dev am: 265981f394

am: b9dc49a612

Change-Id: Ibedd48f978cce4d2579dbe5c935b4d2d61b1c2f4
This commit is contained in:
Christine Franks
2018-03-23 04:23:54 +00:00
committed by android-build-merger
4 changed files with 58 additions and 30 deletions

View File

@@ -118,6 +118,7 @@ public class DevelopmentSettingsDashboardFragmentTest {
final Context appContext = RuntimeEnvironment.application;
DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(appContext, true);
mShadowUserManager.setIsAdminUser(false);
mShadowUserManager.setIsDemoUser(false);
final List<String> nonIndexableKeys =
DevelopmentSettingsDashboardFragment.SEARCH_INDEX_DATA_PROVIDER