Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Cecilia Hong
2022-05-10 15:50:32 +00:00
committed by Android (Google) Code Review
parent 6c90bbe1cf f6eebf40f8
commit 2ec2deea7d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/smartspace/SmartspaceTarget.java
View File

@@ -283,7 +283,7 @@ public final class SmartspaceTarget implements Parcelable {
this.mAssociatedSmartspaceTargetId = in.readString(); this.mAssociatedSmartspaceTargetId = in.readString();
this.mSliceUri = in.readTypedObject(Uri.CREATOR); this.mSliceUri = in.readTypedObject(Uri.CREATOR);
this.mWidget = in.readTypedObject(AppWidgetProviderInfo.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, private SmartspaceTarget(String smartspaceTargetId,
@@ -491,7 +491,7 @@ public final class SmartspaceTarget implements Parcelable {
dest.writeString(this.mAssociatedSmartspaceTargetId); dest.writeString(this.mAssociatedSmartspaceTargetId);
dest.writeTypedObject(this.mSliceUri, flags); dest.writeTypedObject(this.mSliceUri, flags);
dest.writeTypedObject(this.mWidget, flags); dest.writeTypedObject(this.mWidget, flags);
dest.writeTypedObject(this.mTemplateData, flags); dest.writeParcelable(this.mTemplateData, flags);
} }
@Override @Override