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

Commit adfa33b0 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Fix null pointer risk on shouldSleepActivities." into main am: 30c3601a am: 181f82ec 

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



Change-Id: I122bd6622f1febe30759f177943f06ebd6ea65f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88a42229 181f82ec

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

+1 −0
Original line number Diff line number Diff line
@@ -6158,6 +6158,7 @@ class Task extends TaskFragment { 
                // Avoid resuming activities on secondary displays since we don't want bubble

                // activities to be resumed while bubble is still collapsed.

                // TODO(b/113840485): Having keyguard going away state for secondary displays.

                && display != null

                && display.isDefaultDisplay) {

            return false;

        }