[go: nahoru, domu]

Don't use default classloader when reading bundle

Relnote: N/A
Fixes: 172065100
Test: ./gradlew car:app:app:connectedAndroidTest
Change-Id: I4feddf4d668701c65d1eac6580c143957ae797cf
diff --git a/car/app/app/src/main/java/androidx/car/app/serialization/Bundleable.java b/car/app/app/src/main/java/androidx/car/app/serialization/Bundleable.java
index e8b3579..c25dec2 100644
--- a/car/app/app/src/main/java/androidx/car/app/serialization/Bundleable.java
+++ b/car/app/app/src/main/java/androidx/car/app/serialization/Bundleable.java
@@ -75,7 +75,10 @@
             new Creator<Bundleable>() {
                 @Override
                 public Bundleable createFromParcel(final Parcel source) {
-                    return new Bundleable(requireNonNull(source.readBundle()));
+                    // To work around a lint warning that indicates the default class loader will
+                    // not work for restoring our own classes.
+                    return new Bundleable(
+                            requireNonNull(source.readBundle(getClass().getClassLoader())));
                 }
 
                 @Override