Merge "Fix ParcelNullabilityTest." into stage-aosp-master
diff --git a/core/tests/coretests/src/android/os/ParcelNullabilityTest.java b/core/tests/coretests/src/android/os/ParcelNullabilityTest.java
index a6b296d..b4e180c 100644
--- a/core/tests/coretests/src/android/os/ParcelNullabilityTest.java
+++ b/core/tests/coretests/src/android/os/ParcelNullabilityTest.java
@@ -327,8 +327,8 @@
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());
}