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

Commit e8ef5389 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Automerger Merge Worker
Browse files

Merge "Fix lint warnings under... 

Merge "Fix lint warnings under core/tests/coretests/src/android/view/inputmethod/" into sc-dev am: 2f3e1415

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7de1a9b1dc94ebd6efacf40bcdf28c972cfeef8b
parents 8dbcc3c7 2f3e1415

core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeTest.java

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class InputMethodSubtypeTest { 
        assertEquals("he", clonedSubtypeHe.getLocale());

    }



    private static final InputMethodSubtype cloneViaParcel(final InputMethodSubtype original) {

    private static InputMethodSubtype cloneViaParcel(final InputMethodSubtype original) {

        Parcel parcel = null;

        try {

            parcel = Parcel.obtain();

core/tests/coretests/src/android/view/inputmethod/SparseRectFArrayTest.java

+7 −7
Original line number Diff line number Diff line
@@ -62,20 +62,20 @@ public class SparseRectFArrayTest { 


    @Test

    public void testBuilder() throws Exception {

        final RectF TEMP_RECT = new RectF(10.0f, 20.0f, 30.0f, 40.0f);

        final int TEMP_FLAGS = 0x1234;

        final RectF testRect = new RectF(10.0f, 20.0f, 30.0f, 40.0f);

        final int testFlags = 0x1234;



        final SparseRectFArrayBuilder builder = new SparseRectFArrayBuilder();

        builder.append(100, TEMP_RECT.left, TEMP_RECT.top, TEMP_RECT.right, TEMP_RECT.bottom,

                TEMP_FLAGS);

        builder.append(100, testRect.left, testRect.top, testRect.right, testRect.bottom,

                testFlags);

        assertNull(builder.build().get(-1));

        assertNull(builder.build().get(0));

        assertNull(builder.build().get(99));

        assertEquals(0, builder.build().getFlags(99, 0 /* valueIfKeyNotFound */));

        assertEquals(1, builder.build().getFlags(99, 1 /* valueIfKeyNotFound */));

        assertEquals(TEMP_RECT, builder.build().get(100));

        assertEquals(TEMP_FLAGS, builder.build().getFlags(100, 0 /* valueIfKeyNotFound */));

        assertEquals(TEMP_FLAGS, builder.build().getFlags(100, 1 /* valueIfKeyNotFound */));

        assertEquals(testRect, builder.build().get(100));

        assertEquals(testFlags, builder.build().getFlags(100, 0 /* valueIfKeyNotFound */));

        assertEquals(testFlags, builder.build().getFlags(100, 1 /* valueIfKeyNotFound */));

        assertNull(builder.build().get(101));

        assertEquals(0, builder.build().getFlags(101, 0 /* valueIfKeyNotFound */));

        assertEquals(1, builder.build().getFlags(101, 1 /* valueIfKeyNotFound */));