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

Don't reset the value of package_verifier_enable if not in demo mode

Browse Source 
Also, use the correct default value when querying the setting when
starting demo mode.

BUG: 62346506
Test: manually flash and run through setup wizard

Change-Id: Ie9a5ae8a998eb267fcf1f509cb93ea6f566b3c96
This commit is contained in:
Ben Gruver
2017-06-08 15:54:48 -07:00
parent 75b5199e9d
commit ade08cfaa3
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