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

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

Browse Source
This commit is contained in:
Yohei Yukawa
2021-03-11 04:23:03 +00:00
committed by Android (Google) Code Review
parent 108552eb02 1581ad2f90
commit 2f3e141580
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeTest.java
View File

@@ -125,7 +125,7 @@ public class InputMethodSubtypeTest {
assertEquals("he", clonedSubtypeHe.getLocale()); assertEquals("he", clonedSubtypeHe.getLocale());
} }
private static final InputMethodSubtype cloneViaParcel(final InputMethodSubtype original) { private static InputMethodSubtype cloneViaParcel(final InputMethodSubtype original) {
Parcel parcel = null; Parcel parcel = null;
try { try {
parcel = Parcel.obtain(); parcel = Parcel.obtain();

14
core/tests/coretests/src/android/view/inputmethod/SparseRectFArrayTest.java
View File

@@ -62,20 +62,20 @@ public class SparseRectFArrayTest {
@Test @Test
public void testBuilder() throws Exception { public void testBuilder() throws Exception {
final RectF TEMP_RECT = new RectF(10.0f, 20.0f, 30.0f, 40.0f); final RectF testRect = new RectF(10.0f, 20.0f, 30.0f, 40.0f);
final int TEMP_FLAGS = 0x1234; final int testFlags = 0x1234;
final SparseRectFArrayBuilder builder = new SparseRectFArrayBuilder(); final SparseRectFArrayBuilder builder = new SparseRectFArrayBuilder();
builder.append(100, TEMP_RECT.left, TEMP_RECT.top, TEMP_RECT.right, TEMP_RECT.bottom, builder.append(100, testRect.left, testRect.top, testRect.right, testRect.bottom,
TEMP_FLAGS); testFlags);
assertNull(builder.build().get(-1)); assertNull(builder.build().get(-1));
assertNull(builder.build().get(0)); assertNull(builder.build().get(0));
assertNull(builder.build().get(99)); assertNull(builder.build().get(99));
assertEquals(0, builder.build().getFlags(99, 0 /* valueIfKeyNotFound */)); assertEquals(0, builder.build().getFlags(99, 0 /* valueIfKeyNotFound */));
assertEquals(1, builder.build().getFlags(99, 1 /* valueIfKeyNotFound */)); assertEquals(1, builder.build().getFlags(99, 1 /* valueIfKeyNotFound */));
assertEquals(TEMP_RECT, builder.build().get(100)); assertEquals(testRect, builder.build().get(100));
assertEquals(TEMP_FLAGS, builder.build().getFlags(100, 0 /* valueIfKeyNotFound */)); assertEquals(testFlags, builder.build().getFlags(100, 0 /* valueIfKeyNotFound */));
assertEquals(TEMP_FLAGS, builder.build().getFlags(100, 1 /* valueIfKeyNotFound */)); assertEquals(testFlags, builder.build().getFlags(100, 1 /* valueIfKeyNotFound */));
assertNull(builder.build().get(101)); assertNull(builder.build().get(101));
assertEquals(0, builder.build().getFlags(101, 0 /* valueIfKeyNotFound */)); assertEquals(0, builder.build().getFlags(101, 0 /* valueIfKeyNotFound */));
assertEquals(1, builder.build().getFlags(101, 1 /* valueIfKeyNotFound */)); assertEquals(1, builder.build().getFlags(101, 1 /* valueIfKeyNotFound */));