Merge "Fix SearchAction parceling error" (16db7529) · Commits · e / os / android_frameworks_base

core/java/android/app/search/SearchAction.java

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -70,20 +70,20 @@ public final class SearchAction implements Parcelable {

	SearchAction(Parcel in) {		SearchAction(Parcel in) {
	mId = in.readString();		mId = in.readString();
	mIcon = Icon.CREATOR.createFromParcel(in);
	mTitle = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);		mTitle = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
			mIcon = in.readTypedObject(Icon.CREATOR);
	mSubtitle = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);		mSubtitle = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
	mContentDescription = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);		mContentDescription = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
	mPendingIntent = PendingIntent.CREATOR.createFromParcel(in);		mPendingIntent = in.readTypedObject(PendingIntent.CREATOR);
	mIntent = Intent.CREATOR.createFromParcel(in);		mIntent = in.readTypedObject(Intent.CREATOR);
	mUserHandle = in.readTypedObject(UserHandle.CREATOR);		mUserHandle = in.readTypedObject(UserHandle.CREATOR);
	mExtras = in.readBundle();		mExtras = in.readTypedObject(Bundle.CREATOR);
	}		}

	private SearchAction(		private SearchAction(
	@NonNull String id,		@NonNull String id,
	@Nullable Icon icon,
	@NonNull CharSequence title,		@NonNull CharSequence title,
			@Nullable Icon icon,
	@Nullable CharSequence subtitle,		@Nullable CharSequence subtitle,
	@Nullable CharSequence contentDescription,		@Nullable CharSequence contentDescription,
	@Nullable PendingIntent pendingIntent,		@Nullable PendingIntent pendingIntent,
	@@ -91,8 +91,8 @@ public final class SearchAction implements Parcelable {
	@Nullable UserHandle userHandle,		@Nullable UserHandle userHandle,
	@Nullable Bundle extras) {		@Nullable Bundle extras) {
	mId = Objects.requireNonNull(id);		mId = Objects.requireNonNull(id);
	mIcon = icon;
	mTitle = Objects.requireNonNull(title);		mTitle = Objects.requireNonNull(title);
			mIcon = icon;
	mSubtitle = subtitle;		mSubtitle = subtitle;
	mContentDescription = contentDescription;		mContentDescription = contentDescription;
	mPendingIntent = pendingIntent;		mPendingIntent = pendingIntent;
	@@ -192,14 +192,14 @@ public final class SearchAction implements Parcelable {
	@Override		@Override
	public void writeToParcel(@NonNull Parcel out, int flags) {		public void writeToParcel(@NonNull Parcel out, int flags) {
	out.writeString(mId);		out.writeString(mId);
	out.writeTypedObject(mIcon, flags);
	TextUtils.writeToParcel(mTitle, out, flags);		TextUtils.writeToParcel(mTitle, out, flags);
			out.writeTypedObject(mIcon, flags);
	TextUtils.writeToParcel(mSubtitle, out, flags);		TextUtils.writeToParcel(mSubtitle, out, flags);
	TextUtils.writeToParcel(mContentDescription, out, flags);		TextUtils.writeToParcel(mContentDescription, out, flags);
	out.writeTypedObject(mPendingIntent, flags);		out.writeTypedObject(mPendingIntent, flags);
	out.writeTypedObject(mIntent, flags);		out.writeTypedObject(mIntent, flags);
	out.writeTypedObject(mUserHandle, flags);		out.writeTypedObject(mUserHandle, flags);
	out.writeBundle(mExtras);		out.writeTypedObject(mExtras, flags);
	}		}

	@Override		@Override
	@@ -235,12 +235,12 @@ public final class SearchAction implements Parcelable {
	@NonNull		@NonNull
	private String mId;		private String mId;

	@Nullable
	private Icon mIcon;

	@NonNull		@NonNull
	private CharSequence mTitle;		private CharSequence mTitle;

			@Nullable
			private Icon mIcon;

	@Nullable		@Nullable
	private CharSequence mSubtitle;		private CharSequence mSubtitle;

	@@ -337,7 +337,7 @@ public final class SearchAction implements Parcelable {
	*/		*/
	@NonNull		@NonNull
	public SearchAction build() {		public SearchAction build() {
	return new SearchAction(mId, mIcon, mTitle, mSubtitle, mContentDescription,		return new SearchAction(mId, mTitle, mIcon, mSubtitle, mContentDescription,
	mPendingIntent, mIntent, mUserHandle, mExtras);		mPendingIntent, mIntent, mUserHandle, mExtras);
	}		}
	}		}