diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-04 03:09:23 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-04 03:09:23 +0000 |
| commit | 31d1d816376f3a028b3bbc495ec102090cb5f324 (patch) | |
| tree | 464891ca4db8c29b3042ac2568b934e2564a594a | |
| parent | 5db57712c08960be8b3b2031a615deb901a0af71 (diff) | |
| parent | b626d88c92233db47b5362280fddaa1e4e045ebd (diff) | |
| download | platform_packages_apps_Car_Cluster-android10-tests-release.tar.gz platform_packages_apps_Car_Cluster-android10-tests-release.tar.bz2 platform_packages_apps_Car_Cluster-android10-tests-release.zip | |
Snap for 5706892 from b626d88c92233db47b5362280fddaa1e4e045ebd to qt-releaseandroid-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r1android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-release
Change-Id: Ie99fcde8d4863767f8222b67b6b2a8f45f515a19
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | src/android/car/cluster/ClusterRenderingService.java | 6 |
2 files changed, 8 insertions, 1 deletions
@@ -36,7 +36,8 @@ LOCAL_USE_AAPT2 := true LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_STATIC_JAVA_LIBRARIES := \ - android.car.cluster.navigation + android.car.cluster.navigation \ + androidx.car_car-cluster LOCAL_JAVA_LIBRARIES += android.car LOCAL_STATIC_ANDROID_LIBRARIES += \ diff --git a/src/android/car/cluster/ClusterRenderingService.java b/src/android/car/cluster/ClusterRenderingService.java index 6c924c4..5770773 100644 --- a/src/android/car/cluster/ClusterRenderingService.java +++ b/src/android/car/cluster/ClusterRenderingService.java @@ -40,6 +40,8 @@ import android.view.Display; import android.view.InputDevice; import android.view.KeyEvent; +import androidx.versionedparcelable.ParcelUtils; + import com.google.protobuf.InvalidProtocolBufferException; import java.io.FileDescriptor; @@ -191,6 +193,10 @@ public class ClusterRenderingService extends InstrumentClusterRenderingService i public void onEvent(int eventType, Bundle bundle) { StringBuilder bundleSummary = new StringBuilder(); if (eventType == NAV_STATE_EVENT_ID) { + // Required to prevent backwards compatibility crash with old map providers + // sending androidx.versionedparcelables + bundle.setClassLoader(ParcelUtils.class.getClassLoader()); + // Attempt to read proto byte array byte[] protoBytes = bundle.getByteArray(NAV_STATE_PROTO_BUNDLE_KEY); if (protoBytes != null) { |