Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ade08cfa authored by Ben Gruver's avatar Ben Gruver
Browse files

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

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
parent 75b5199e

services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java

+11 −7
Original line number Diff line number Diff line
@@ -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();



        if (mDeviceInDemoMode) {

            mInjector.getUserManager().setUserRestriction(UserManager.DISALLOW_SAFE_BOOT,

                    mSafeBootRestrictionInitialState, UserHandle.SYSTEM);

            Settings.Global.putInt(mInjector.getContentResolver(),

                Settings.Global.PACKAGE_VERIFIER_ENABLE, mPackageVerifierEnableInitialState);

                        Settings.Global.PACKAGE_VERIFIER_ENABLE,

                        mPackageVerifierEnableInitialState);

        }



        mDeviceInDemoMode = false;

        mIsCarrierDemoMode = false;

    }



    @Override