Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f4c8d21 authored by Junda Liu's avatar Junda Liu Committed by Android (Google) Code Review
Browse files

Merge "Make getIccSimChallengeResponse a carrier API."

parents 97084b4b 1845a3bf

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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();

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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();

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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();

telephony/java/android/telephony/TelephonyManager.java

+4 −1
Original line number Diff line number Diff line
@@ -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);