Fix dream not working on top of pinned apps

Bug: 162473921
Test: manual
Change-Id: Ia76bd24fe63927e2273fee991632ba6ba0fc829f
This commit is contained in:
Galia Peycheva
2021-05-27 18:17:17 +02:00
parent 23efb3ab75
commit 04ef18ed26
2 changed files with 6 additions and 0 deletions

View File

@@ -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

View File

@@ -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());
}