diff options
3 files changed, 22 insertions, 21 deletions
diff --git a/telephony/java/android/telephony/NetworkScanRequest.java b/telephony/java/android/telephony/NetworkScanRequest.java index 465b6aa79d40..0ceb103d0f27 100644 --- a/telephony/java/android/telephony/NetworkScanRequest.java +++ b/telephony/java/android/telephony/NetworkScanRequest.java @@ -20,10 +20,10 @@ import android.annotation.IntDef; import android.os.Parcel; import android.os.Parcelable; -import java.util.ArrayList; -import java.util.Arrays; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.ArrayList; +import java.util.Arrays; /** * Defines a request to peform a network scan. @@ -221,9 +221,11 @@ public final class NetworkScanRequest implements Parcelable { private NetworkScanRequest(Parcel in) { mScanType = in.readInt(); - mSpecifiers = (RadioAccessSpecifier[]) in.readParcelableArray( - Object.class.getClassLoader(), - RadioAccessSpecifier.class); + Parcelable[] tempSpecifiers = in.readParcelableArray(Object.class.getClassLoader()); + mSpecifiers = new RadioAccessSpecifier[tempSpecifiers.length]; + for (int i = 0; i < tempSpecifiers.length; i++) { + mSpecifiers[i] = (RadioAccessSpecifier) tempSpecifiers[i]; + } mSearchPeriodicity = in.readInt(); mMaxSearchTime = in.readInt(); mIncrementalResults = in.readBoolean(); diff --git a/telephony/java/android/telephony/PhoneNumberRange.java b/telephony/java/android/telephony/PhoneNumberRange.java index e6f107e28c98..2b199d2df141 100644 --- a/telephony/java/android/telephony/PhoneNumberRange.java +++ b/telephony/java/android/telephony/PhoneNumberRange.java @@ -85,18 +85,18 @@ public final class PhoneNumberRange implements Parcelable { } private PhoneNumberRange(Parcel in) { - mCountryCode = in.readStringNoHelper(); - mPrefix = in.readStringNoHelper(); - mLowerBound = in.readStringNoHelper(); - mUpperBound = in.readStringNoHelper(); + mCountryCode = in.readString(); + mPrefix = in.readString(); + mLowerBound = in.readString(); + mUpperBound = in.readString(); } @Override public void writeToParcel(Parcel dest, int flags) { - dest.writeStringNoHelper(mCountryCode); - dest.writeStringNoHelper(mPrefix); - dest.writeStringNoHelper(mLowerBound); - dest.writeStringNoHelper(mUpperBound); + dest.writeString(mCountryCode); + dest.writeString(mPrefix); + dest.writeString(mLowerBound); + dest.writeString(mUpperBound); } @Override diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java index 2d8e2376b9d8..832771daa409 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -16,8 +16,6 @@ package android.telephony; -import com.android.telephony.Rlog; - import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; @@ -40,6 +38,7 @@ import android.util.DisplayMetrics; import android.util.Log; import com.android.internal.telephony.util.TelephonyUtils; +import com.android.telephony.Rlog; import java.util.ArrayList; import java.util.Arrays; @@ -685,8 +684,8 @@ public class SubscriptionInfo implements Parcelable { int id = source.readInt(); String iccId = source.readString(); int simSlotIndex = source.readInt(); - CharSequence displayName = source.readCharSequence(); - CharSequence carrierName = source.readCharSequence(); + CharSequence displayName = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source); + CharSequence carrierName = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source); int nameSource = source.readInt(); int iconTint = source.readInt(); String number = source.readString(); @@ -705,8 +704,8 @@ public class SubscriptionInfo implements Parcelable { int carrierid = source.readInt(); int profileClass = source.readInt(); int subType = source.readInt(); - String[] ehplmns = source.readStringArray(); - String[] hplmns = source.readStringArray(); + String[] ehplmns = source.createStringArray(); + String[] hplmns = source.createStringArray(); String groupOwner = source.readString(); UiccAccessRule[] carrierConfigAccessRules = source.createTypedArray( UiccAccessRule.CREATOR); @@ -732,8 +731,8 @@ public class SubscriptionInfo implements Parcelable { dest.writeInt(mId); dest.writeString(mIccId); dest.writeInt(mSimSlotIndex); - dest.writeCharSequence(mDisplayName); - dest.writeCharSequence(mCarrierName); + TextUtils.writeToParcel(mDisplayName, dest, 0); + TextUtils.writeToParcel(mCarrierName, dest, 0); dest.writeInt(mNameSource); dest.writeInt(mIconTint); dest.writeString(mNumber); |