From 873dccbd6aa476dc502046d6800a42a3c623e088 Mon Sep 17 00:00:00 2001 From: fionaxu Date: Sun, 16 Sep 2018 19:01:25 -0700 Subject: expose getIsimDomain to systemAPI This is required for carrier apps to get Imsi domain name as part of request URI. Bug: 115884625 Test: telephony unit test Change-Id: Iad405dc2b2f182039a828e4a4709d273579a8273 --- api/system-current.txt | 1 + telephony/java/android/telephony/TelephonyManager.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index e3f52a0f2d21..a5ae645466a3 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5251,6 +5251,7 @@ package android.telephony { method public deprecated boolean getDataEnabled(); method public deprecated boolean getDataEnabled(int); method public boolean getEmergencyCallbackMode(); + method public java.lang.String getIsimDomain(); method public int getSimApplicationState(); method public int getSimCardState(); method public java.util.List getTelephonyHistograms(); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 723657120593..44dcebb0871e 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -4138,11 +4138,16 @@ public class TelephonyManager { } /** - * Returns the IMS home network domain name that was loaded from the ISIM. - * @return the IMS domain name, or null if not present or not loaded + * Returns the IMS home network domain name that was loaded from the ISIM {@see #APPTYPE_ISIM}. + * @return the IMS domain name. Returns {@code null} if ISIM hasn't been loaded or IMS domain + * hasn't been loaded or isn't present on the ISIM. + * + *

Requires Permission: + * {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE READ_PRIVILEGED_PHONE_STATE} * @hide */ - @UnsupportedAppUsage + @SystemApi + @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain() { try { IPhoneSubInfo info = getSubscriberInfo(); -- cgit v1.2.3-59-g8ed1b