diff options
| author | 2019-08-08 20:02:15 -0700 | |
|---|---|---|
| committer | 2019-08-08 20:02:15 -0700 | |
| commit | 6ee0f72adac955fb6bec3b84f82f90f61a3863f0 (patch) | |
| tree | a70011f99b92319efb8ecdcc90bcf03fffbb2fc5 | |
| parent | 6db6f37674ff722cb8158b9b9af545556b745ab8 (diff) | |
| parent | 5009264077381b65cd916b962b3b88c6f12b84d1 (diff) | |
Merge "Fix ParcelNullabilityTest." into stage-aosp-master am: dc6a23bab9 am: bddb4d69d2
am: 5009264077
Change-Id: I35d67a157515e37059478825bfdb2409d420e1c6
| -rw-r--r-- | core/tests/coretests/src/android/os/ParcelNullabilityTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/tests/coretests/src/android/os/ParcelNullabilityTest.java b/core/tests/coretests/src/android/os/ParcelNullabilityTest.java index a6b296d37f82..b4e180cf647c 100644 --- 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()); } |