Merge "Update CTS test for readSerializable and readParcelable APIs." am: c7d8cc1f43

Original change: https://android-review.googlesource.com/c/platform/cts/+/1913772

Change-Id: I9bd446b210c7e86086139f1a0db12a6a4fd35a14

1 files changed, 9 insertions, 0 deletions

diff --git a/tests/tests/os/src/android/os/cts/ParcelTest.java b/tests/tests/os/src/android/os/cts/ParcelTest.java
index a975c7ada88..f4b1a06e37d 100644
--- a/tests/tests/os/src/android/os/cts/ParcelTest.java
+++ b/tests/tests/os/src/android/os/cts/ParcelTest.java
@@ -2126,6 +2126,12 @@ public class ParcelTest extends AndroidTestCase {
         assertEquals("test", e2.getMessage());
 
         p.setDataPosition(0);
+        Object object2 = p.readSerializable(null, Object.class);
+        assertTrue(object1 instanceof Exception);
+        Exception e3 = (Exception) object2;
+        assertEquals("test", e3.getMessage());
+
+        p.setDataPosition(0);
         assertThrows(BadParcelableException.class, () -> p.readSerializable(mcl, String.class));
         p.recycle();
     }
@@ -2175,6 +2181,9 @@ public class ParcelTest extends AndroidTestCase {
         p.writeParcelable(testSubIntent, 0);
         p.setDataPosition(0);
         assertEquals(testSubIntent, (p.readParcelable(getClass().getClassLoader(), Intent.class)));
+
+        p.setDataPosition(0);
+        assertEquals(testSubIntent, (p.readParcelable(getClass().getClassLoader(), Object.class)));
         p.recycle();
     }