summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Brad Ebinger <breadley@google.com> 2018-10-01 20:58:56 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-10-01 20:58:56 +0000
commit417b7b14bb0f3f3e5e0ad2e46848230e944a7ae9 (patch)
treeb1b37ab1a53c5b369c973dc0725dfdfac7d8dea3
parent6c35ea901c364f14198009b00b9e838842516911 (diff)
parent25311cd31ccbbc3bd4404f47729599479f33bb23 (diff)
Merge "Revert isResolvingImsBinding ITelephony interface"
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java17
-rw-r--r--telephony/java/com/android/internal/telephony/ITelephony.aidl6
2 files changed, 0 insertions, 23 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index f154b82ba31f..f83ea68af1c5 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -5707,23 +5707,6 @@ public class TelephonyManager {
}
/**
- * @return true if the IMS resolver is busy resolving a binding and should not be considered
- * available, false if the IMS resolver is idle.
- * @hide
- */
- public boolean isResolvingImsBinding() {
- try {
- ITelephony telephony = getITelephony();
- if (telephony != null) {
- return telephony.isResolvingImsBinding();
- }
- } catch (RemoteException e) {
- Rlog.e(TAG, "isResolvingImsBinding, RemoteException: " + e.getMessage());
- }
- return false;
- }
-
- /**
* Set IMS registration state
*
* @param Registration state
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 33616149c3b4..627dfaa5d36e 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -707,12 +707,6 @@ interface ITelephony {
IImsConfig getImsConfig(int slotId, int feature);
/**
- * @return true if the IMS resolver is busy resolving a binding and should not be considered
- * available, false if the IMS resolver is idle.
- */
- boolean isResolvingImsBinding();
-
- /**
* @return true if the ImsService to bind to for the slot id specified was set, false otherwise.
*/
boolean setImsService(int slotId, boolean isCarrierImsService, String packageName);