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

Merge "Prevent NullPointerException and remove unsed variable"

Browse Source
This commit is contained in:
TreeHugger Robot
2023-02-07 06:18:51 +00:00
committed by Android (Google) Code Review
parent 1be4f4e3b8 ccf95f2467
commit 51ec8b02da
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/tests/coretests/src/android/view/SurfaceControlViewHostInsetsTest.java
View File

@@ -69,7 +69,6 @@ public class SurfaceControlViewHostInsetsTest {
private InsetsState statusBarState(boolean visible) {
final InsetsState insetsState = new InsetsState();
final int id = InsetsSource.createId(null /* owner */, 0 /* index */, statusBars());
insetsState.setDisplayFrame(new Rect(0, 0, 1000, 1000));
insetsState.getOrCreateSource(
InsetsSource.createId(null /* owner */, 0 /* index */, statusBars()), statusBars())

6
services/core/java/com/android/server/wm/InsetsPolicy.java
View File

@@ -634,6 +634,12 @@ class InsetsPolicy {
final SparseArray<InsetsSourceControl> controlsReady = new SparseArray<>();
final InsetsSourceControl[] controls =
mStateController.getControlsForDispatch(mDummyControlTarget);
if (controls == null) {
if (callback != null) {
DisplayThread.getHandler().post(callback);
}
return;
}
for (InsetsSourceControl control : controls) {
if (isTransient(control.getType()) && control.getLeash() != null) {
typesReady |= control.getType();