Merge "Merge "Remove IMS Emergency Calling availability API" am: 4b10333c26... (4a08f074) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+0 −18

Original line number	Diff line number	Diff line
		@@ -5332,24 +5332,6 @@ public class TelephonyManager {
		return null;
		}

		/**
		* Determines if emergency calling is allowed for the MMTEL feature on the slot provided.
		* @param slotIndex The SIM slot of the MMTEL feature
		* @return true if emergency calling is allowed, false otherwise.
		* @hide
		*/
		public boolean isEmergencyMmTelAvailable(int slotIndex) {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null) {
		return telephony.isEmergencyMmTelAvailable(slotIndex);
		}
		} catch (RemoteException e) {
		Rlog.e(TAG, "isEmergencyMmTelAvailable, RemoteException: " + e.getMessage());
		}
		return false;
		}

		/**
		* @return true if the IMS resolver is busy resolving a binding and should not be considered
		* available, false if the IMS resolver is idle.

+0 −6

Original line number	Diff line number	Diff line
		@@ -816,12 +816,6 @@ interface ITelephony {
		*/
		IImsConfig getImsConfig(int slotId, int feature);

		/**
		* Returns true if emergency calling is available for the MMTEL feature associated with the
		* slot specified.
		*/
		boolean isEmergencyMmTelAvailable(int slotId);

		/**
		* @return true if the IMS resolver is busy resolving a binding and should not be considered
		* available, false if the IMS resolver is idle.