Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove usage of hidden Parcel APIs"

Browse Source
This commit is contained in:
Sooraj Sasindran
2019-12-11 21:26:36 +00:00
committed by Android (Google) Code Review
parent eeb32bd1aa bdca31b105
commit 411ce63094
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
telephony/java/android/telephony/NetworkScanRequest.java
View File

@@ -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();

16
telephony/java/android/telephony/PhoneNumberRange.java
View File

@@ -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

12
telephony/java/android/telephony/SubscriptionInfo.java
View File

@@ -665,8 +665,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();
@@ -685,8 +685,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);
@@ -711,8 +711,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);