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

Commit 012ace16 authored by Ling Ma's avatar Ling Ma Committed by Gerrit Code Review
Browse files

Merge "Unhide API isPersistent and getProfileId"

parents 30e41a64 5a093a01

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -42036,6 +42036,7 @@ package android.telephony.data { 
    method public int getNetworkTypeBitmask();

    method public String getOperatorNumeric();

    method public String getPassword();

    method public int getProfileId();

    method public int getProtocol();

    method @Deprecated public java.net.InetAddress getProxyAddress();

    method public String getProxyAddressAsString();
@@ -42043,6 +42044,7 @@ package android.telephony.data { 
    method public int getRoamingProtocol();

    method public String getUser();

    method public boolean isEnabled();

    method public boolean isPersistent();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field public static final int AUTH_TYPE_CHAP = 2; // 0x2

    field public static final int AUTH_TYPE_NONE = 0; // 0x0

telephony/java/android/telephony/data/ApnSetting.java

+1 −3
Original line number Diff line number Diff line
@@ -545,7 +545,6 @@ public class ApnSetting implements Parcelable { 
     * Returns the profile id to which the APN saved in modem.

     *

     * @return the profile id of the APN

     * @hide

     */

    public int getProfileId() {

        return mProfileId;
@@ -554,8 +553,7 @@ public class ApnSetting implements Parcelable { 
    /**

     * Returns if the APN setting is persistent on the modem.

     *

     * @return is the APN setting to be set in modem

     * @hide

     * @return {@code true} if the APN setting is persistent on the modem.

     */

    public boolean isPersistent() {

        return mPersistent;