Merge "Avoid the scenario where Contexts list filled with null value in ShowAnrDialogs()" am: 99e5c70ff0 am: 7f2cb4c0a5 am: 5f95d3af26 am: db45d16579
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793211 Change-Id: I749b97dfb807de7b79b1eb9dcc318de917f82b26
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user