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

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

Merge "Enable Turn Off Work 2.0 by default." into udc-dev am: f432d9b1 am: 9bb03491 

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



Change-Id: I33402963211f15f9d293f06582cc426a9cdce8a0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c9a577be 9bb03491

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

+1 −1
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 














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















    private static final String KEEP_PROFILES_RUNNING_FLAG = "enable_keep_profiles_running";













    private static final boolean DEFAULT_KEEP_PROFILES_RUNNING_FLAG = false;













    private static final boolean DEFAULT_KEEP_PROFILES_RUNNING_FLAG = true;





























    private static final String ENABLE_WORK_PROFILE_TELEPHONY_FLAG =















            "enable_work_profile_telephony";