diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityTaskManagerService.java | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/LockTaskController.java | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 134ecdeffa8f..29e55df32509 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -1381,6 +1381,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { getActivityStartController().obtainStarter(intent, "dream") .setCallingUid(callingUid) .setCallingPid(callingPid) + .setCallingPackage(intent.getPackage()) .setActivityInfo(a) .setActivityOptions(options.toBundle()) // To start the dream from background, we need to start it from a persistent diff --git a/services/core/java/com/android/server/wm/LockTaskController.java b/services/core/java/com/android/server/wm/LockTaskController.java index 62c155a3c198..94a175caba22 100644 --- a/services/core/java/com/android/server/wm/LockTaskController.java +++ b/services/core/java/com/android/server/wm/LockTaskController.java @@ -355,6 +355,11 @@ public class LockTaskController { return false; } + // Allow the dream to start during lock task mode + if (wc.isActivityTypeDream()) { + return false; + } + return !(isTaskAuthAllowlisted(taskAuth) || mLockTaskModeTasks.isEmpty()); } |