From d9d7abb899e07590f8f4773aa8629b8ba8705597 Mon Sep 17 00:00:00 2001 From: Daniel Bright Date: Fri, 13 Mar 2020 15:13:27 -0700 Subject: [PATCH] Undo isDataCapable as Public API Test: make Bug: 146206136 Change-Id: I8b6a7e001c114df5e90668738b2a2b978e8757fa --- api/current.txt | 2 +- telephony/java/android/telephony/TelephonyManager.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index 06dd88b033a1a..0b4534f21ab5f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -48207,7 +48207,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); @@ -82234,3 +82233,4 @@ package org.xmlpull.v1.sax2 { } } + diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 780161aa15575..c066c205aa6b0 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -11158,6 +11158,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;