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

Commit 51ec8b02 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prevent NullPointerException and remove unsed variable"

parents 1be4f4e3 ccf95f24

core/tests/coretests/src/android/view/SurfaceControlViewHostInsetsTest.java

+0 −1
Original line number Diff line number Diff line
@@ -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())

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

+6 −0
Original line number Diff line number Diff line
@@ -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();