From 2c27b9a9fa74e59f953e7b918744a3a668236b92 Mon Sep 17 00:00:00 2001
From: Santos Cordon <santoscordon@google.com>
Date: Fri, 12 Jun 2015 15:27:01 -0700
Subject: [PATCH] Clean up SIM CallManager APIs.

Bug: 21499476
Change-Id: Iaded74c6b885b0745dfa85d0b7733bdad75d615a
---
 .../java/android/telecom/TelecomManager.java  | 33 -------------------
 .../internal/telecom/ITelecomService.aidl     | 10 ------
 2 files changed, 43 deletions(-)

diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 0cd8c191203ed..a0669e4058514 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -476,39 +476,6 @@ public class TelecomManager {
         return null;
     }
 
-    /**
-     * Sets the SIM call manager to the specified phone account.
-     *
-     * @param accountHandle The phone account handle of the account to set as the sim call manager.
-     * @hide
-     */
-    public void setSimCallManager(PhoneAccountHandle accountHandle) {
-        try {
-            if (isServiceConnected()) {
-                getTelecomService().setSimCallManager(accountHandle);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "Error calling ITelecomService#setSimCallManager");
-        }
-    }
-
-    /**
-     * Returns the list of registered SIM call managers.
-     *
-     * @return List of registered SIM call managers.
-     * @hide
-     */
-    public List<PhoneAccountHandle> getSimCallManagers() {
-        try {
-            if (isServiceConnected()) {
-                return getTelecomService().getSimCallManagers(mContext.getOpPackageName());
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "Error calling ITelecomService#getSimCallManagers");
-        }
-        return new ArrayList<>();
-    }
-
     /**
      * Returns the current connection manager. Apps must be prepared for this method to return
      * {@code null}, indicating that there currently exists no user-chosen default
diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
index ea6a74aa6d90e..fb0f6dafee71c 100644
--- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
+++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
@@ -92,16 +92,6 @@ interface ITelecomService {
      */
     PhoneAccountHandle getSimCallManager();
 
-    /**
-     * @see TelecomServiceImpl#setSimCallManager
-     */
-    void setSimCallManager(in PhoneAccountHandle account);
-
-    /**
-     * @see TelecomServiceImpl#getSimCallManagers
-     */
-    List<PhoneAccountHandle> getSimCallManagers(String callingPackage);
-
     /**
      * @see TelecomServiceImpl#registerPhoneAccount
      */