From 5a093a0132fd5a2ff10c9f7bc5c1112afd02f301 Mon Sep 17 00:00:00 2001
From: Ling Ma <linggm@google.com>
Date: Tue, 15 Mar 2022 09:50:41 -0700
Subject: [PATCH] Unhide API isPersistent and getProfileId

Test: cts ApnSettingTest
Bug: 223599330
Change-Id: I1aaf0903e2b27b3a3c919e5c08c509a60053e74e
Merged-In: I1aaf0903e2b27b3a3c919e5c08c509a60053e74e
---
 core/api/current.txt                                  | 2 ++
 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 15cf71d300407..d6f0a4e1499b2 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -42039,6 +42039,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();
@@ -42046,6 +42047,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 cb112cf3b93a8..f8540202b3bf1 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;