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

Commit 284216ee authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix issue in InsetsState.set" into rvc-dev am: 2a600311 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11987763

Change-Id: I31d6457476face337313c9ef5a7f8f8e5b40f508
parents 39cea471 2a600311

core/java/android/view/InsetsState.java

+1 −2
Original line number Diff line number Diff line
@@ -427,8 +427,7 @@ public class InsetsState implements Parcelable { 
        if (copySources) {

            for (int i = 0; i < SIZE; i++) {

                InsetsSource source = other.mSources[i];

                if (source == null) continue;

                mSources[i] = new InsetsSource(source);

                mSources[i] = source != null ? new InsetsSource(source) : null;

            }

        } else {

            for (int i = 0; i < SIZE; i++) {

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

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ public class InsetsStateTest { 
        mState.getSource(ITYPE_IME).setVisibleFrame(new Rect(0, 0, 50, 10));

        mState.getSource(ITYPE_IME).setVisible(true);

        mState.getSource(ITYPE_STATUS_BAR).setFrame(new Rect(0, 0, 100, 100));

        mState2.getSource(ITYPE_NAVIGATION_BAR).setFrame(new Rect(0, 0, 100, 100));

        mState2.set(mState, true);

        assertEquals(mState, mState2);

    }