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

Commit 2f3e1415 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

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

parents 108552eb 1581ad2f

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 */));