Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fab691b authored by Galia Peycheva's avatar Galia Peycheva Committed by Automerger Merge Worker
Browse files

Merge "Fix dream not working on top of pinned apps" into sc-dev am: 1dfd9484 am: 9c24460a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14733700

Change-Id: I2964a79540ce87a0fe30034762093d4e110113f7
parents 5bb1f7a7 9c24460a

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

+1 −0
Original line number Diff line number Diff line
@@ -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

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

+5 −0
Original line number Diff line number Diff line
@@ -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());

    }