diff options
| author | 2020-03-27 13:28:54 +0000 | |
|---|---|---|
| committer | 2020-03-27 13:28:54 +0000 | |
| commit | 27cf1baa4798cdd7e6864afec398eb45227c9eea (patch) | |
| tree | 7e5ccaf056f93d8d0a3f58773f5b40644073892b | |
| parent | 6cf6809826f45dad4fb9a110b8044e98c48a933a (diff) | |
| parent | 46f58562d4f1e2078f179570e48e790adc5ce18f (diff) | |
Merge "Fix unsuspending personal apps." into rvc-dev
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index e304bca4553c..3ddee29366c7 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -15742,9 +15742,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } } + final int suspendedState = suspended + ? PERSONAL_APPS_SUSPENDED_EXPLICITLY + : PERSONAL_APPS_NOT_SUSPENDED; mInjector.binderWithCleanCallingIdentity( - () -> applyPersonalAppsSuspension( - callingUserId, PERSONAL_APPS_SUSPENDED_EXPLICITLY)); + () -> applyPersonalAppsSuspension(callingUserId, suspendedState)); DevicePolicyEventLogger .createEvent(DevicePolicyEnums.SET_PERSONAL_APPS_SUSPENDED) |