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

Commit 66e3542e authored by Pavel Grafov's avatar Pavel Grafov Committed by Automerger Merge Worker
Browse files

Update the behavior to match the documentation. am: bc72f89e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24587528



Change-Id: I3d55f07538345c53d5c0f0c3abfd91f3b4fcaa0f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e40773d bc72f89e

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −7
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    // to decide whether an existing policy in the {@link #DEVICE_POLICIES_XML} needs to

    // be upgraded. See {@link PolicyVersionUpgrader} on instructions how to add an upgrade

    // step.

    static final int DPMS_VERSION = 5;

    static final int DPMS_VERSION = 6;















    static {















        SECURE_SETTINGS_ALLOWLIST = new ArraySet<>();










@@ -875,8 +875,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













    private static final boolean DEFAULT_ENABLE_DEVICE_POLICY_ENGINE_FOR_FINANCE_FLAG = true;





























    // TODO(b/265683382) remove the flag after rollout.













    private static final String KEEP_PROFILES_RUNNING_FLAG = "enable_keep_profiles_running";













    public static final boolean DEFAULT_KEEP_PROFILES_RUNNING_FLAG = true;













    public static final boolean DEFAULT_KEEP_PROFILES_RUNNING_FLAG = false;





























    // TODO(b/261999445) remove the flag after rollout.















    private static final String HEADLESS_FLAG = "headless";










@@ -23831,10 +23830,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













    }





























    private static boolean isKeepProfilesRunningFlagEnabled() {













        return DeviceConfig.getBoolean(













                NAMESPACE_DEVICE_POLICY_MANAGER,













                KEEP_PROFILES_RUNNING_FLAG,













                DEFAULT_KEEP_PROFILES_RUNNING_FLAG);













        return DEFAULT_KEEP_PROFILES_RUNNING_FLAG;















    }





























    private boolean isUnicornFlagEnabled() {

























services/devicepolicy/java/com/android/server/devicepolicy/PolicyVersionUpgrader.java



+17
−0




























Original line number
Diff line number
Diff line








@@ -117,6 +117,19 @@ public class PolicyVersionUpgrader {













            currentVersion = 5;















        }





























        if (currentVersion == 5) {













            Slog.i(LOG_TAG, String.format("Upgrading from version %d", currentVersion));













            // No-op upgrade here:













            // DevicePolicyData.mEffectiveKeepProfilesRunning is only stored in XML file when it is













            // different from its default value, otherwise the tag is not written. When loading, if













            // the tag is missing, the field retains the value previously assigned in the













            // constructor, which is the default value.













            // In version 5 the default value was 'true', in version 6 it is 'false', so when













            // loading XML version 5 we need to initialize the field to 'true' for it to be restored













            // correctly in case the tag is missing. This is done in loadDataForUser().













            currentVersion = 6;













        }





























        writePoliciesAndVersion(allUsers, allUsersData, ownersData, currentVersion);















    }


























@@ -282,6 +295,10 @@ public class PolicyVersionUpgrader {













    private DevicePolicyData loadDataForUser(















            int userId, int loadVersion, ComponentName ownerComponent) {















        DevicePolicyData policy = new DevicePolicyData(userId);













        // See version 5 -> 6 step in upgradePolicy()













        if (loadVersion == 5 && userId == UserHandle.USER_SYSTEM) {













            policy.mEffectiveKeepProfilesRunning = true;













        }















        DevicePolicyData.load(policy,















                mProvider.makeDevicePoliciesJournaledFile(userId),















                mProvider.getAdminInfoSupplier(userId),