diff options
author | 2023-11-28 02:28:11 +0000 | |
---|---|---|
committer | 2023-11-28 02:28:11 +0000 | |
commit | 30c3601a1a6d378fc317bc0ab562ecadb538bd7e (patch) | |
tree | 8b6534e2d8c5e1c405c1df76c664004c333350d0 | |
parent | e09c2b6b355c38e1a6ecb1dfd846c700ee1378ce (diff) | |
parent | 7f9d9636f00992c53ae5c1e95f96fd5fbc4f112d (diff) |
Merge "Fix null pointer risk on shouldSleepActivities." into main
-rw-r--r-- | services/core/java/com/android/server/wm/Task.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 6d560e4b762b..f2346e6eab5d 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -6135,6 +6135,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; } |