Merge "Make getIccSimChallengeResponse a carrier API."

This commit is contained in:
Junda Liu
2016-01-20 06:33:09 +00:00
committed by Android (Google) Code Review
4 changed files with 7 additions and 1 deletions

View File

@@ -36244,6 +36244,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();

View File

@@ -38589,6 +38589,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();

View File

@@ -36258,6 +36258,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();

View File

@@ -3494,10 +3494,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
*
* <p>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);