Merge "Unhide methods required for Parcelable class" (80bd5fe2) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -8205,6 +8205,7 @@ package android.telephony.data {
		}

		public final class DataProfile implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public String getApn();
		method public int getAuthType();
		method public int getBearerBitmap();
		@@ -8222,6 +8223,8 @@ package android.telephony.data {
		method public boolean isEnabled();
		method public boolean isPersistent();
		method public boolean isPreferred();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.data.DataProfile> CREATOR;
		field public static final int TYPE_3GPP = 1; // 0x1
		field public static final int TYPE_3GPP2 = 2; // 0x2
		field public static final int TYPE_COMMON = 0; // 0x0

+0 −3

Original line number	Diff line number	Diff line
		@@ -243,7 +243,6 @@ public final class DataProfile implements Parcelable {
		*/
		public boolean isPreferred() { return mPreferred; }

		/** @hide */
		@Override
		public int describeContents() {
		return 0;
		@@ -266,7 +265,6 @@ public final class DataProfile implements Parcelable {
		return (o == this \|\| toString().equals(o.toString()));
		}

		/** @hide */
		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeInt(mProfileId);
		@@ -288,7 +286,6 @@ public final class DataProfile implements Parcelable {
		dest.writeBoolean(mPreferred);
		}

		/** @hide */
		public static final @android.annotation.NonNull Parcelable.Creator<DataProfile> CREATOR =
		new Parcelable.Creator<DataProfile>() {
		@Override