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

Commit eb059600 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:... 

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

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



Change-Id: I1d64d1dad6ed247f97764835f6b1760582c67cc7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 297f475d adfa33b0

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

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

        }