Merge "Remove getIsimChallengeResponse" (b6d5a85a) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+0 −22

Original line number	Diff line number	Diff line
		@@ -4768,28 +4768,6 @@ public class TelephonyManager {
		}
		}

		/**
		* Returns the response of ISIM Authetification through RIL.
		* Returns null if the Authentification hasn't been successed or isn't present iphonesubinfo.
		* @return the response of ISIM Authetification, or null if not available
		* @hide
		* @deprecated
		* @see getIccAuthentication with appType=PhoneConstants.APPTYPE_ISIM
		*/
		public String getIsimChallengeResponse(String nonce){
		try {
		IPhoneSubInfo info = getSubscriberInfo();
		if (info == null)
		return null;
		return info.getIsimChallengeResponse(nonce);
		} catch (RemoteException ex) {
		return null;
		} catch (NullPointerException ex) {
		// This could happen before phone restarts due to crashing
		return null;
		}
		}

		// ICC SIM Application Types
		/** UICC application type is SIM */
		public static final int APPTYPE_SIM = PhoneConstants.APPTYPE_SIM;

+0 −8

Original line number	Diff line number	Diff line
		@@ -194,14 +194,6 @@ interface IPhoneSubInfo {
		*/
		String[] getIsimPcscf(int subId);

		/**
		* TODO: Deprecate and remove this interface. Superceded by getIccsimChallengeResponse.
		* Returns the response of ISIM Authetification through RIL.
		* @return the response of ISIM Authetification, or null if
		* the Authentification hasn't been successed or isn't present iphonesubinfo.
		*/
		String getIsimChallengeResponse(String nonce);

		/**
		* Returns the response of the SIM application on the UICC to authentication
		* challenge/response algorithm. The data string and challenge response are