From 7a5e98e1314bb96b027889ffaf3ef07863ed6592 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Wed, 4 Mar 2020 11:23:39 -0800 Subject: [PATCH] Added the high usage hidden APIs back Added the high usage hidden APIs back for Q or older apps. Apps built on R SDK should use the new API getNetworkCountryIso(int). Test: Build Bug: 150368215 Merged-In: I1ccfbe269f3d9b91b715c20bd2f200cfb20e2a8c Change-Id: I1ccfbe269f3d9b91b715c20bd2f200cfb20e2a8c (cherry picked from commit ff8275e6b91f940d2f3082380630edcde32b475f) --- .../java/android/telephony/TelephonyManager.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 5584d983e7cdc..8a0f5eaed033a 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -2756,6 +2756,17 @@ public class TelephonyManager { } } + /** + * @hide + * @deprecated Use {@link #getNetworkCountryIso(int)} instead. + */ + @Deprecated + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, + publicAlternatives = "Use {@link #getNetworkCountryIso(int)} instead.") + public String getNetworkCountryIsoForPhone(int phoneId) { + return getNetworkCountryIso(phoneId); + } + /* * When adding a network type to the list below, make sure to add the correct icon to * MobileSignalController.mapIconSets() as well as NETWORK_TYPES