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

Commit 60f41330 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 

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



Change-Id: Ica70829481b386b9732fffefc87cc5a17622b86f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04e773c3 2ec2deea

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