From 21a5e8f7a13d7b7f60334116cbd3b5c5a07d1cb0 Mon Sep 17 00:00:00 2001
From: Daniel Bright <dbright@google.com>
Date: Fri, 13 Mar 2020 15:13:27 -0700
Subject: [PATCH] Undo isDataCapable as Public API

Test: make
Bug: 146206136
Change-Id: I8b6a7e001c114df5e90668738b2a2b978e8757fa
Merged-In: I8b6a7e001c114df5e90668738b2a2b978e8757fa
---
 api/current.txt                                        | 1 -
 telephony/java/android/telephony/TelephonyManager.java | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index 770be339a4e72..5c843c8f321bb 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -45973,7 +45973,6 @@ 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.MODIFY_PHONE_STATE}) public boolean isDataEnabled();
     method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataRoamingEnabled();
     method public boolean isEmergencyNumber(@NonNull String);
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 0d0c7e956831e..8cfc8b493e220 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -11117,6 +11117,8 @@ public class TelephonyManager {
      * 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;