Merge "Revert isResolvingImsBinding ITelephony interface" into pi-dev

telephony/java/android/telephony/TelephonyManager.java

@@ -5435,23 +5435,6 @@ public class TelephonyManager {
         return null;
     }
 
-    /**
-     * @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
      *

telephony/java/com/android/internal/telephony/ITelephony.aidl

@@ -822,12 +822,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.
     */