Replace hidden Parcel.(read|write)CharSequence usages
This CL replaces above hidden API usages with below:
- read: TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel
- write: TextUtils.writeToParcel
The hidden APIs actually call those replacements, so this is safe to do.
Bug: 119783509
Test: mmm . (under frameworks/av/packages/MediaComponents)
Change-Id: Ifb3b432bee7ee072bbd544cb067749f073e5917a
diff --git a/packages/MediaComponents/apex/java/android/media/MediaDescription.java b/packages/MediaComponents/apex/java/android/media/MediaDescription.java
index ad71d9f..31079e5 100644
--- a/packages/MediaComponents/apex/java/android/media/MediaDescription.java
+++ b/packages/MediaComponents/apex/java/android/media/MediaDescription.java
@@ -7,6 +7,7 @@
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
+import android.text.TextUtils;
/**
* A simple set of metadata for a media item suitable for display. This can be
@@ -122,10 +123,9 @@
private MediaDescription(Parcel in) {
mMediaId = in.readString();
- //TODO(b/119783509): Resolve hidden API Usage. Parcel#{read,write}CharSequence
- mTitle = ""; //in.readCharSequence();
- mSubtitle = ""; //in.readCharSequence();
- mDescription = ""; //in.readCharSequence();
+ mTitle = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
+ mSubtitle = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
+ mDescription = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
mIcon = in.readParcelable(null);
mIconUri = in.readParcelable(null);
mExtras = in.readBundle();
@@ -211,12 +211,9 @@
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(mMediaId);
- //TODO(b/119783509): Resolve hidden API Usage. Parcel#{read,write}CharSequence
- /*
- dest.writeCharSequence(mTitle);
- dest.writeCharSequence(mSubtitle);
- dest.writeCharSequence(mDescription);
- */
+ TextUtils.writeToParcel(mTitle, dest, 0);
+ TextUtils.writeToParcel(mSubtitle, dest, 0);
+ TextUtils.writeToParcel(mDescription, dest, 0);
dest.writeParcelable(mIcon, flags);
dest.writeParcelable(mIconUri, flags);
dest.writeBundle(mExtras);
diff --git a/packages/MediaComponents/apex/java/android/media/session/PlaybackState.java b/packages/MediaComponents/apex/java/android/media/session/PlaybackState.java
index 38df10d..ed4f9af 100644
--- a/packages/MediaComponents/apex/java/android/media/session/PlaybackState.java
+++ b/packages/MediaComponents/apex/java/android/media/session/PlaybackState.java
@@ -318,9 +318,7 @@
mActions = in.readLong();
mCustomActions = in.createTypedArrayList(CustomAction.CREATOR);
mActiveItemId = in.readLong();
- //TODO(b/119783509): Resolve hidden API Usage. Parcel#{read,write}CharSequence
- //mErrorMessage = in.readCharSequence();
- mErrorMessage = ""; //TODO: remove this.
+ mErrorMessage = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
mExtras = in.readBundle();
}
@@ -355,8 +353,7 @@
dest.writeLong(mActions);
dest.writeTypedList(mCustomActions);
dest.writeLong(mActiveItemId);
- //TODO(b/119783509): Resolve hidden API Usage. Parcel#{read,write}CharSequence
- //dest.writeCharSequence(mErrorMessage);
+ TextUtils.writeToParcel(mErrorMessage, dest, 0);
dest.writeBundle(mExtras);
}