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

Merge "Unhide API isPersistent and getProfileId" am: 012ace16da am: 4a0307dedf

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2028924

Change-Id: I50715ae589ff05d056586aa828ac0257bc6f9efe
This commit is contained in:
Ling Ma
2022-03-17 00:37:28 +00:00
committed by Automerger Merge Worker
parent c2fabc1d4a 4a0307dedf
commit eb2b918152
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -42036,6 +42036,7 @@ package android.telephony.data {
method public int getNetworkTypeBitmask(); method public int getNetworkTypeBitmask();
method public String getOperatorNumeric(); method public String getOperatorNumeric();
method public String getPassword(); method public String getPassword();
method public int getProfileId();
method public int getProtocol(); method public int getProtocol();
method @Deprecated public java.net.InetAddress getProxyAddress(); method @Deprecated public java.net.InetAddress getProxyAddress();
method public String getProxyAddressAsString(); method public String getProxyAddressAsString();
@@ -42043,6 +42044,7 @@ package android.telephony.data {
method public int getRoamingProtocol(); method public int getRoamingProtocol();
method public String getUser(); method public String getUser();
method public boolean isEnabled(); method public boolean isEnabled();
method public boolean isPersistent();
method public void writeToParcel(@NonNull android.os.Parcel, int); 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_CHAP = 2; // 0x2
field public static final int AUTH_TYPE_NONE = 0; // 0x0 field public static final int AUTH_TYPE_NONE = 0; // 0x0

4
telephony/java/android/telephony/data/ApnSetting.java
View File

@@ -545,7 +545,6 @@ public class ApnSetting implements Parcelable {
* Returns the profile id to which the APN saved in modem. * Returns the profile id to which the APN saved in modem.
* *
* @return the profile id of the APN * @return the profile id of the APN
* @hide
*/ */
public int getProfileId() { public int getProfileId() {
return mProfileId; return mProfileId;
@@ -554,8 +553,7 @@ public class ApnSetting implements Parcelable {
/** /**
* Returns if the APN setting is persistent on the modem. * Returns if the APN setting is persistent on the modem.
* *
* @return is the APN setting to be set in modem * @return {@code true} if the APN setting is persistent on the modem.
* @hide
*/ */
public boolean isPersistent() { public boolean isPersistent() {
return mPersistent; return mPersistent;