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

Commit 181f82ec 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 

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



Change-Id: Ib9f71da55c3b8488962592864db1a2da9951bd0a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d670890 30c3601a

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;

        }