summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-08-09 01:59:23 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-08-09 01:59:23 +0000
commitdc6a23bab939f5d8d0bd0203e359f775e16616ac (patch)
tree93a5310bb2a243c9182d4a65488448f893d150ce
parente8460d61e5ccaea7c54f73b9d7d50e71ade05914 (diff)
parent42fb0c80fb277c752fca684cae3125dfc2faf409 (diff)
Merge "Fix ParcelNullabilityTest." into stage-aosp-master
-rw-r--r--core/tests/coretests/src/android/os/ParcelNullabilityTest.java4
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());
}