Merge "Fix the UI template data parcel reading." into tm-dev

This commit is contained in:
Cecilia Hong
2022-05-10 15:50:32 +00:00
committed by Android (Google) Code Review

View File

@@ -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