From 25311cd31ccbbc3bd4404f47729599479f33bb23 Mon Sep 17 00:00:00 2001
From: Brad Ebinger <breadley@google.com>
Date: Wed, 13 Jun 2018 17:11:50 -0700
Subject: [PATCH] Revert isResolvingImsBinding ITelephony interface

Reverting the only user of this interface.

Bug: 109762920
Bug: 116766786
Test: GTS/Unit tests for ImsService
Merged-In: I9c8cc1c4401590865f33fa13402152287063cecf
Change-Id: Id2e1ac2e4fbbcb7f019e79568f21ee56c94b6c1f
---
 telephony/java/android/telephony/TelephonyManager.java  | 17 -----------------
 .../java/com/android/internal/telephony/ITelephony.aidl |  6 ------
 2 files changed, 23 deletions(-)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 7f27009205c4..3ef5a4aca20e 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -5659,23 +5659,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 df3944018e3c..afb1d82b5e9f 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -817,12 +817,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);
-- 
2.11.0