Merge "Fix ParcelNullabilityTest." into stage-aosp-master am: dc6a23bab9 am: bddb4d69d2

am: 5009264077 Change-Id: I35d67a157515e37059478825bfdb2409d420e1c6
2019-08-08 20:02:15 -07:00
parent 6db6f37674 5009264077
commit 6ee0f72ada
1 changed files with 2 additions and 2 deletions
--- a/core/tests/coretests/src/android/os/ParcelNullabilityTest.java
+++ b/core/tests/coretests/src/android/os/ParcelNullabilityTest.java
@@ -327,8 +327,8 @@ public final class ParcelNullabilityTest {
        Parcel p = Parcel.obtain();
        p.writeParcelableList(null, 0);

-        List<Object> list = new ArrayList<>();
-        throughBytes(p).readParcelableList(null, null);
+        List<Parcelable> list = new ArrayList<>();
+        throughBytes(p).readParcelableList(list, null);
        assertTrue(list.isEmpty());
    }