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

Browse Source 
am: ffd8343ba8

Change-Id: I5ac1fce3ab71415061ba152d9e34c96f9a53e1c9
This commit is contained in:
Ben Gruver
2017-06-10 00:45:02 +00:00
committed by android-build-merger
parent 40b0ef4579 ffd8343ba8
commit 5be97babd6
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( mSafeBootRestrictionInitialState = mInjector.getUserManager().hasUserRestriction(
UserManager.DISALLOW_SAFE_BOOT, UserHandle.SYSTEM); UserManager.DISALLOW_SAFE_BOOT, UserHandle.SYSTEM);
mPackageVerifierEnableInitialState = Settings.Global.getInt(mInjector.getContentResolver(), mPackageVerifierEnableInitialState = Settings.Global.getInt(mInjector.getContentResolver(),
Settings.Global.PACKAGE_VERIFIER_ENABLE, 0); Settings.Global.PACKAGE_VERIFIER_ENABLE, 1);
} }
private void stopDemoMode() { private void stopDemoMode() {
mDeviceInDemoMode = false;
mIsCarrierDemoMode = false;
mPreloadAppsInstaller = null; mPreloadAppsInstaller = null;
mCameraIdsWithFlash = null; mCameraIdsWithFlash = null;
mInjector.destroyWakeLock(); mInjector.destroyWakeLock();
unregisterBroadcastReceiver(); unregisterBroadcastReceiver();
mInjector.getUserManager().setUserRestriction(UserManager.DISALLOW_SAFE_BOOT, if (mDeviceInDemoMode) {
mSafeBootRestrictionInitialState, UserHandle.SYSTEM); mInjector.getUserManager().setUserRestriction(UserManager.DISALLOW_SAFE_BOOT,
Settings.Global.putInt(mInjector.getContentResolver(), mSafeBootRestrictionInitialState, UserHandle.SYSTEM);
Settings.Global.PACKAGE_VERIFIER_ENABLE, mPackageVerifierEnableInitialState); Settings.Global.putInt(mInjector.getContentResolver(),
Settings.Global.PACKAGE_VERIFIER_ENABLE,
mPackageVerifierEnableInitialState);
}
mDeviceInDemoMode = false;
mIsCarrierDemoMode = false;
} }
@Override @Override