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

Commit 1dfd9484 authored by Galia Peycheva's avatar Galia Peycheva Committed by Android (Google) Code Review
Browse files

Merge "Fix dream not working on top of pinned apps" into sc-dev

parents d7638021 04ef18ed

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

    }