From 1845a3bf5691f9d674f943d3ca36603e4ca2cb0a Mon Sep 17 00:00:00 2001 From: Junda Liu Date: Tue, 5 Jan 2016 14:00:04 -0800 Subject: [PATCH] Make getIccSimChallengeResponse a carrier API. Bug: b/22863855 Change-Id: Ife4093da3a7a5849a02efcf00ded9a4a7761a1f6 --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + telephony/java/android/telephony/TelephonyManager.java | 5 ++++- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index 2f0c706bb4e3d..2175402b76939 100644 --- a/api/current.txt +++ b/api/current.txt @@ -36022,6 +36022,7 @@ package android.telephony { method public java.lang.String getDeviceId(int); method public java.lang.String getDeviceSoftwareVersion(); method public java.lang.String getGroupIdLevel1(); + method public java.lang.String getIccSimChallengeResponse(int, java.lang.String); method public java.lang.String getLine1Number(); method public java.lang.String getMmsUAProfUrl(); method public java.lang.String getMmsUserAgent(); diff --git a/api/system-current.txt b/api/system-current.txt index 81831f87aceaf..4dc67b5aef016 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -38329,6 +38329,7 @@ package android.telephony { method public java.lang.String getDeviceId(int); method public java.lang.String getDeviceSoftwareVersion(); method public java.lang.String getGroupIdLevel1(); + method public java.lang.String getIccSimChallengeResponse(int, java.lang.String); method public java.lang.String getLine1Number(); method public java.lang.String getMmsUAProfUrl(); method public java.lang.String getMmsUserAgent(); diff --git a/api/test-current.txt b/api/test-current.txt index c1552789cad35..5354492cde05e 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -36025,6 +36025,7 @@ package android.telephony { method public java.lang.String getDeviceId(int); method public java.lang.String getDeviceSoftwareVersion(); method public java.lang.String getGroupIdLevel1(); + method public java.lang.String getIccSimChallengeResponse(int, java.lang.String); method public java.lang.String getLine1Number(); method public java.lang.String getMmsUAProfUrl(); method public java.lang.String getMmsUserAgent(); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 0b5aaa3b273b2..04c0989524632 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3492,10 +3492,13 @@ public class TelephonyManager { /** * Returns the response of SIM Authentication through RIL for the default subscription. * Returns null if the Authentication hasn't been successful + * + *

Requires that the calling app has carrier privileges. + * @see #hasCarrierPrivileges + * * @param appType ICC application type (@see com.android.internal.telephony.PhoneConstants#APPTYPE_xxx) * @param data authentication challenge data * @return the response of SIM Authentication, or null if not available - * @hide */ public String getIccSimChallengeResponse(int appType, String data) { return getIccSimChallengeResponse(getDefaultSubscription(), appType, data);