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

Commit c06988b0 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... 

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

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

Change-Id: If6e477d695731ff247c6c0d81c13159109342f31
parents 1d4622ae 1fab691b

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

    }