From f6eebf40f8a17da68e522ef5e8ddd28eb06f049f Mon Sep 17 00:00:00 2001 From: Cecilia Date: Tue, 3 May 2022 22:33:54 +0000 Subject: [PATCH] Fix the UI template data parcel reading. Update the UI template data's parcel r/w with #readParcelable and #writeParcelable so it works for the BaseTemplateData's subclasses. Bug: 231401631 Test: Tested locally Change-Id: I64b0dd8cb781acd0f2badba7f87454ae9f72eb28 --- core/java/android/app/smartspace/SmartspaceTarget.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/smartspace/SmartspaceTarget.java b/core/java/android/app/smartspace/SmartspaceTarget.java index be077435b0807..c5982fc27358d 100644 --- a/core/java/android/app/smartspace/SmartspaceTarget.java +++ b/core/java/android/app/smartspace/SmartspaceTarget.java @@ -283,7 +283,7 @@ public final class SmartspaceTarget implements Parcelable { this.mAssociatedSmartspaceTargetId = in.readString(); this.mSliceUri = in.readTypedObject(Uri.CREATOR); this.mWidget = in.readTypedObject(AppWidgetProviderInfo.CREATOR); - this.mTemplateData = in.readTypedObject(BaseTemplateData.CREATOR); + this.mTemplateData = in.readParcelable(/* loader= */null, BaseTemplateData.class); } private SmartspaceTarget(String smartspaceTargetId, @@ -491,7 +491,7 @@ public final class SmartspaceTarget implements Parcelable { dest.writeString(this.mAssociatedSmartspaceTargetId); dest.writeTypedObject(this.mSliceUri, flags); dest.writeTypedObject(this.mWidget, flags); - dest.writeTypedObject(this.mTemplateData, flags); + dest.writeParcelable(this.mTemplateData, flags); } @Override