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

Commit 2ec2deea authored by Cecilia Hong's avatar Cecilia Hong Committed by Android (Google) Code Review
Browse files

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

parents 6c90bbe1 f6eebf40

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