Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am: ffd8343ba8

Browse Source 
am: 5be97babd6

Change-Id: Ic49f4796cf1bf26036a7d0aa7c06b2d0823e15de
This commit is contained in:
Ben Gruver
2017-06-10 00:52:24 +00:00
committed by android-build-merger
parent 52bde254ba 5be97babd6
commit 6fc077a2b1
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
View File

@@ -547,21 +547,25 @@ public class RetailDemoModeService extends SystemService {
mSafeBootRestrictionInitialState = mInjector.getUserManager().hasUserRestriction(
UserManager.DISALLOW_SAFE_BOOT, UserHandle.SYSTEM);
mPackageVerifierEnableInitialState = Settings.Global.getInt(mInjector.getContentResolver(),
Settings.Global.PACKAGE_VERIFIER_ENABLE, 0);
Settings.Global.PACKAGE_VERIFIER_ENABLE, 1);
}
private void stopDemoMode() {
mDeviceInDemoMode = false;
mIsCarrierDemoMode = false;
mPreloadAppsInstaller = null;
mCameraIdsWithFlash = null;
mInjector.destroyWakeLock();
unregisterBroadcastReceiver();
mInjector.getUserManager().setUserRestriction(UserManager.DISALLOW_SAFE_BOOT,
mSafeBootRestrictionInitialState, UserHandle.SYSTEM);
Settings.Global.putInt(mInjector.getContentResolver(),
Settings.Global.PACKAGE_VERIFIER_ENABLE, mPackageVerifierEnableInitialState);
if (mDeviceInDemoMode) {
mInjector.getUserManager().setUserRestriction(UserManager.DISALLOW_SAFE_BOOT,
mSafeBootRestrictionInitialState, UserHandle.SYSTEM);
Settings.Global.putInt(mInjector.getContentResolver(),
Settings.Global.PACKAGE_VERIFIER_ENABLE,
mPackageVerifierEnableInitialState);
}
mDeviceInDemoMode = false;
mIsCarrierDemoMode = false;
}
@Override