commit f4553c9dfd7bda98c7d91f8da9c44aa5d4cddfc2
author Louis Chang <louischang@google.com> Fri Sep 01 11:58:17 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 01 11:58:17 2023 +0000
tree 33bd09c9a24eb27be044f2d54609971e730a2d5e
parent 0eb63a67d958385e2e3de4f123fc898af68bea4a
parent fdd4e6bfb3ffafbfcb8fe00487b48dd6eb94816f

Merge "Clear calling identity before updating lock-task packages" into main

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 42c3630..53d1adf 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -2648,9 +2648,15 @@
             mAmInternal.enforceCallingPermission(Manifest.permission.UPDATE_LOCK_TASK_PACKAGES,
                     "updateLockTaskPackages()");
         }
-        synchronized (mGlobalLock) {
-            ProtoLog.w(WM_DEBUG_LOCKTASK, "Allowlisting %d:%s", userId, Arrays.toString(packages));
-            getLockTaskController().updateLockTaskPackages(userId, packages);
+        final long origId = Binder.clearCallingIdentity();
+        try {
+            synchronized (mGlobalLock) {
+                ProtoLog.w(WM_DEBUG_LOCKTASK, "Allowlisting %d:%s", userId,
+                        Arrays.toString(packages));
+                getLockTaskController().updateLockTaskPackages(userId, packages);
+            }
+        } finally {
+            Binder.restoreCallingIdentity(origId);
         }
     }