Merge "Fix unsuspending personal apps." into rvc-dev am: 27cf1baa47 am: 833dcb3c60 am: dfae0cd318 am: 5c8ff14b00

Change-Id: Idb77da61a46856e8dba492bad9c1d6da4beca5c0
2020-03-27 14:42:36 +00:00
parent 789b93f006 5c8ff14b00
commit 91cf8ac601
1 changed files with 4 additions and 2 deletions
--- 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)