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

Commit 2f45d6dc authored by Sooraj Sasindran's avatar Sooraj Sasindran
Browse files

Remove usage of hidden Parcel APIs

Remove usage of hidden Parcel APIs

Bug: 140908357
Test: Build
Merged-In: Iccc072e03f05141370c4ad5cc49cb8e25929fcac
Change-Id: Iccc072e03f05141370c4ad5cc49cb8e25929fcac
parent 7998fbc6
Loading
Loading
Loading
Loading
+7 −5
Original line number Original line Diff line number Diff line
@@ -20,10 +20,10 @@ import android.annotation.IntDef;
import android.os.Parcel;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.Parcelable;


import java.util.ArrayList;
import java.util.Arrays;
import java.lang.annotation.Retention;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.Arrays;


/**
/**
 * Defines a request to peform a network scan.
 * Defines a request to peform a network scan.
@@ -221,9 +221,11 @@ public final class NetworkScanRequest implements Parcelable {


    private NetworkScanRequest(Parcel in) {
    private NetworkScanRequest(Parcel in) {
        mScanType = in.readInt();
        mScanType = in.readInt();
        mSpecifiers = (RadioAccessSpecifier[]) in.readParcelableArray(
        Parcelable[] tempSpecifiers = in.readParcelableArray(Object.class.getClassLoader());
                Object.class.getClassLoader(),
        mSpecifiers = new RadioAccessSpecifier[tempSpecifiers.length];
                RadioAccessSpecifier.class);
        for (int i = 0; i < tempSpecifiers.length; i++) {
            mSpecifiers[i] = (RadioAccessSpecifier) tempSpecifiers[i];
        }
        mSearchPeriodicity = in.readInt();
        mSearchPeriodicity = in.readInt();
        mMaxSearchTime = in.readInt();
        mMaxSearchTime = in.readInt();
        mIncrementalResults = in.readBoolean();
        mIncrementalResults = in.readBoolean();
+8 −8
Original line number Original line Diff line number Diff line
@@ -85,18 +85,18 @@ public final class PhoneNumberRange implements Parcelable {
    }
    }


    private PhoneNumberRange(Parcel in) {
    private PhoneNumberRange(Parcel in) {
        mCountryCode = in.readStringNoHelper();
        mCountryCode = in.readString();
        mPrefix = in.readStringNoHelper();
        mPrefix = in.readString();
        mLowerBound = in.readStringNoHelper();
        mLowerBound = in.readString();
        mUpperBound = in.readStringNoHelper();
        mUpperBound = in.readString();
    }
    }


    @Override
    @Override
    public void writeToParcel(Parcel dest, int flags) {
    public void writeToParcel(Parcel dest, int flags) {
        dest.writeStringNoHelper(mCountryCode);
        dest.writeString(mCountryCode);
        dest.writeStringNoHelper(mPrefix);
        dest.writeString(mPrefix);
        dest.writeStringNoHelper(mLowerBound);
        dest.writeString(mLowerBound);
        dest.writeStringNoHelper(mUpperBound);
        dest.writeString(mUpperBound);
    }
    }


    @Override
    @Override
+7 −8
Original line number Original line Diff line number Diff line
@@ -16,8 +16,6 @@


package android.telephony;
package android.telephony;


import com.android.telephony.Rlog;

import android.annotation.Nullable;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.SystemApi;
import android.compat.annotation.UnsupportedAppUsage;
import android.compat.annotation.UnsupportedAppUsage;
@@ -40,6 +38,7 @@ import android.util.DisplayMetrics;
import android.util.Log;
import android.util.Log;


import com.android.internal.telephony.util.TelephonyUtils;
import com.android.internal.telephony.util.TelephonyUtils;
import com.android.telephony.Rlog;


import java.util.ArrayList;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Arrays;
@@ -685,8 +684,8 @@ public class SubscriptionInfo implements Parcelable {
            int id = source.readInt();
            int id = source.readInt();
            String iccId = source.readString();
            String iccId = source.readString();
            int simSlotIndex = source.readInt();
            int simSlotIndex = source.readInt();
            CharSequence displayName = source.readCharSequence();
            CharSequence displayName = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source);
            CharSequence carrierName = source.readCharSequence();
            CharSequence carrierName = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source);
            int nameSource = source.readInt();
            int nameSource = source.readInt();
            int iconTint = source.readInt();
            int iconTint = source.readInt();
            String number = source.readString();
            String number = source.readString();
@@ -705,8 +704,8 @@ public class SubscriptionInfo implements Parcelable {
            int carrierid = source.readInt();
            int carrierid = source.readInt();
            int profileClass = source.readInt();
            int profileClass = source.readInt();
            int subType = source.readInt();
            int subType = source.readInt();
            String[] ehplmns = source.readStringArray();
            String[] ehplmns = source.createStringArray();
            String[] hplmns = source.readStringArray();
            String[] hplmns = source.createStringArray();
            String groupOwner = source.readString();
            String groupOwner = source.readString();
            UiccAccessRule[] carrierConfigAccessRules = source.createTypedArray(
            UiccAccessRule[] carrierConfigAccessRules = source.createTypedArray(
                UiccAccessRule.CREATOR);
                UiccAccessRule.CREATOR);
@@ -732,8 +731,8 @@ public class SubscriptionInfo implements Parcelable {
        dest.writeInt(mId);
        dest.writeInt(mId);
        dest.writeString(mIccId);
        dest.writeString(mIccId);
        dest.writeInt(mSimSlotIndex);
        dest.writeInt(mSimSlotIndex);
        dest.writeCharSequence(mDisplayName);
        TextUtils.writeToParcel(mDisplayName, dest, 0);
        dest.writeCharSequence(mCarrierName);
        TextUtils.writeToParcel(mCarrierName, dest, 0);
        dest.writeInt(mNameSource);
        dest.writeInt(mNameSource);
        dest.writeInt(mIconTint);
        dest.writeInt(mIconTint);
        dest.writeString(mNumber);
        dest.writeString(mNumber);