Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am: ffd8343ba8
am: 5be97babd6
Change-Id: Ic49f4796cf1bf26036a7d0aa7c06b2d0823e15de
This commit is contained in:
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user