Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 411ce630 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Android (Google) Code Review
Browse files

Merge "Remove usage of hidden Parcel APIs"

parents eeb32bd1 bdca31b1

telephony/java/android/telephony/NetworkScanRequest.java

+7 −5
Original line number Diff line number Diff line
@@ -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();

telephony/java/android/telephony/PhoneNumberRange.java

+8 −8
Original line number Diff line number Diff line
@@ -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

telephony/java/android/telephony/SubscriptionInfo.java

+6 −6
Original line number Diff line number Diff line
@@ -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);