commit 04ef18ed269ebccb202817968b811bea94fa5e46
author Galia Peycheva <galinap@google.com> Thu May 27 18:17:17 2021 +0200
committer Galia Peycheva <galinap@google.com> Thu May 27 18:18:17 2021 +0200
tree 9e77c40309bc9a44b2187ea51e8921fd0ad334d6
parent 23efb3ab75ae1a5e55197e0fa93140a83d35a1ad

Fix dream not working on top of pinned apps

Bug: 162473921
Test: manual
Change-Id: Ia76bd24fe63927e2273fee991632ba6ba0fc829f

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 c7e4abb..c9be4bc 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 @@
                 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

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

diff --git a/services/core/java/com/android/server/wm/LockTaskController.java b/services/core/java/com/android/server/wm/LockTaskController.java
index 62c155a..94a175c 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 @@
             return false;
         }
 
+        // Allow the dream to start during lock task mode
+        if (wc.isActivityTypeDream()) {
+            return false;
+        }
+
         return !(isTaskAuthAllowlisted(taskAuth) || mLockTaskModeTasks.isEmpty());
     }