From af6732ef6f196bd0f455847b67b15fcfc2efa927 Mon Sep 17 00:00:00 2001
From: Nancy Chen <nancychen@google.com>
Date: Thu, 16 Oct 2014 21:08:39 +0000
Subject: [PATCH] Revert "Add API method to extract subscription ID from phone
 account (1/3)"

This reverts commit b0cad32c3cadd0387f6dcd82aade629e6f2f6bee.

Change-Id: I54b6373ba0fc7d1ecc64c6ceedc7b371c7017cd8
---
 .../java/android/telecom/TelecomManager.java  | 44 -------------------
 .../internal/telecom/ITelecomService.aidl     | 10 -----
 2 files changed, 54 deletions(-)

diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index da95af342b79a..b4d429a19e217 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -309,50 +309,6 @@ public class TelecomManager {
         }
     }
 
-    /**
-     * Return the corresponding PhoneAccount id of a given subscription id.
-     *
-     * @param subscriptionId The value of the subscription id the caller is trying to get a phone
-     * account id for.
-     * @return A string representing the phone account id or null.
-     *
-     * @hide
-     */
-    @SystemApi
-    public String getPhoneAccountIdForSubscriptionId(long subscriptionId) {
-        try {
-            if (isServiceConnected()) {
-                return getTelecomService().getPhoneAccountIdForSubscriptionId(subscriptionId);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "Error calling ITelecomService#getSubscriptionIdForPhoneAccount", e);
-        }
-        return null;
-    }
-
-    /**
-     * Return the subscription id of the PhoneAccount if it exists. This only applies to PSTN
-     * or SIM-based phone accounts. Return -1 otherwise.
-     *
-     * @param accountHandle The {@link PhoneAccountHandle} the caller is trying to get the
-     * subscription id for.
-     * @return The subscription id (a long) or -1 if the phone account is not a SIM or
-     * a subscription id does not exist.
-     *
-     * @hide
-     */
-    @SystemApi
-    public long getSubscriptionIdForPhoneAccount(PhoneAccountHandle accountHandle) {
-        try {
-            if (isServiceConnected()) {
-                return getTelecomService().getSubscriptionIdForPhoneAccount(accountHandle);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "Error calling ITelecomService#getSubscriptionIdForPhoneAccount", e);
-        }
-        return -1;
-    }
-
     /**
      * Return the {@link PhoneAccount} which is the user-chosen default for making outgoing phone
      * calls with a specified URI scheme.
diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
index 8c786731d793a..feb09d570e191 100644
--- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
+++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
@@ -34,16 +34,6 @@ interface ITelecomService {
      */
     void showInCallScreen(boolean showDialpad);
 
-    /**
-     * @see TelecomServiceImpl#getPhoneAccountIdForSubscriptionId
-     */
-    String getPhoneAccountIdForSubscriptionId(in long subscriptionId);
-
-    /**
-     * @see TelecomServiceImpl#getSubscriptionIdForPhoneAccount
-     */
-    long getSubscriptionIdForPhoneAccount(in PhoneAccountHandle account);
-
     /**
      * @see TelecomServiceImpl#getDefaultOutgoingPhoneAccount
      */