Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49baad0d authored by Cecilia Hong's avatar Cecilia Hong Committed by Automerger Merge Worker
Browse files

Merge "Fix the UI template data parcel reading." into tm-dev am: 2ec2deea... 

Merge "Fix the UI template data parcel reading." into tm-dev am: 2ec2deea am: 60f41330 am: 4d14ba0d

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



Change-Id: I49a8e03a0518111cde136798b3f90d978a069f22
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c505075b 4d14ba0d

core/java/android/app/smartspace/SmartspaceTarget.java

+2 −2
Original line number Diff line number Diff line
@@ -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