From a3648a387c0ceeb6b31bfea9ef532d2aa506bde0 Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Fri, 12 Mar 2021 19:08:02 +0900
Subject: Make isDataCapable a public API

There is no definitive API to determine whether a device supports mobile
data; this API fills the gap.

Bug: 146206136
Test: m
Change-Id: I5daa302063ee4e9c27dd9ba1a09d65af80ed9d99
---
 core/api/current.txt                                   | 1 +
 telephony/java/android/telephony/TelephonyManager.java | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 4d55bf90ad40..80970eb528a5 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -41024,6 +41024,7 @@ package android.telephony {
     method @Deprecated public String iccTransmitApduBasicChannel(int, int, int, int, int, String);
     method @Deprecated public String iccTransmitApduLogicalChannel(int, int, int, int, int, int, String);
     method public boolean isConcurrentVoiceAndDataSupported();
+    method public boolean isDataCapable();
     method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isDataConnectionAllowed();
     method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataEnabled();
     method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataEnabledForReason(int);
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index e77ee365b4d3..63e1f6e8e144 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -11859,12 +11859,6 @@ public class TelephonyManager {
      * "Data capable" means that this device supports packet-switched
      * data connections over the telephony network.
      * <p>
-     * Note: the meaning of this flag is subtly different from the
-     * PackageManager.FEATURE_TELEPHONY system feature, which is available
-     * on any device with a telephony radio, even if the device is
-     * voice-only.
-     *
-     * @hide
      */
     public boolean isDataCapable() {
         if (mContext == null) return true;
-- 
cgit v1.2.3-59-g8ed1b