Merge "Merge "Remove IMS Emergency Calling availability API" am: 4b10333c26 am: 56b387aaf1" into pi-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2018-03-13 18:11:50 +00:00
committed by Android (Google) Code Review
2 changed files with 0 additions and 24 deletions

View File

@@ -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.

View File

@@ -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.