commit 99bf1aa159d7a2d2ee5162d7c1baff3cdb22ea58
author Amit Mahajan <amitmahajan@google.com> Fri Nov 01 16:31:34 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Nov 01 16:31:34 2019 -0700
tree ddaf27cbbac201f6d5eee1d35c0668531050965d
parent f6a1a0c850eae614adfea597b8568b4325748dd6
parent 7ab5b4928f7b7c6375553ee79f68c204d6b46f28

Merge "Make isDataEnabledForApn() a system api."
am: 7ab5b4928f

Change-Id: I7e146b5908fdb71165b21327a4da2b677b2540b4

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index f903470..6134b94 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -8201,6 +8201,7 @@
     method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String iccTransmitApduLogicalChannelBySlot(int, int, int, int, int, int, int, @Nullable String);
     method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApplicationOnUicc(int);
     method public boolean isDataConnectivityPossible();
+    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int);
     method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled();
     method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();
     method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 48fbf57..d2559e7 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -11488,10 +11488,13 @@
      *  3) APN type is whitelisted. E.g. MMS is whitelisted if
      *  {@link SubscriptionManager#setAlwaysAllowMmsData} is turned on.
      *
+     * @param apnType Value indicating the apn type. Apn types are defined in {@link ApnSetting}.
      * @return whether data is enabled for a apn type.
      *
      * @hide
      */
+    @SystemApi
+    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
     public boolean isDataEnabledForApn(@ApnSetting.ApnType int apnType) {
         String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
         try {