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 am: 2ec2deea7d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18181585

Change-Id: I91345366a5c50b7401d0f741b6b4b14c1479df38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cecilia Hong
2022-05-10 20:39:06 +00:00
committed by Automerger Merge Worker
parent a0d00523f2 2ec2deea7d
commit b8b7cf9e53
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.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