Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid the scenario where Contexts list filled with null value in ShowAnrDialogs()" am: 99e5c70ff0 am: 7f2cb4c0a5 am: 5f95d3af26 am: db45d16579 am: 71dfb42d20

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

Change-Id: I28bf8de72b4f6bce9210bb29fde2b3d989911c0e
This commit is contained in:
Riddle Hsu
2021-08-12 12:36:21 +00:00
committed by Automerger Merge Worker
parent 6d065fd143 71dfb42d20
commit 25b5d20adf
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/WindowProcessController.java
View File

@@ -945,7 +945,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
final int displayId = r.getDisplayId();
final Context c = root.getDisplayUiContext(displayId);
if (r.mVisibleRequested && !displayContexts.contains(c)) {
if (c != null && r.mVisibleRequested && !displayContexts.contains(c)) {
displayContexts.add(c);
}
}