diff options
| author | 2022-03-17 00:17:46 +0000 | |
|---|---|---|
| committer | 2022-03-17 00:17:46 +0000 | |
| commit | 4a0307dedff377d08cb27d358b6abc1b22471409 (patch) | |
| tree | 139392376e55ce29a634bb9b04ce7f21dff2f901 | |
| parent | 0b0a4d71a20b031ebc05aa71c8829c2ec10e1d5d (diff) | |
| parent | 012ace16daa148f6be01e61dbff7a37f71ed5054 (diff) | |
Merge "Unhide API isPersistent and getProfileId" am: 012ace16da
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2028924
Change-Id: Ic69ba34fbf1077eb2c364a2c2c9c6c785d8613ba
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/data/ApnSetting.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index d791342b206f..0610446728d7 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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 diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index cb112cf3b93a..f8540202b3bf 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -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; |