From 1b7ed7b1c2224728340251eb19433ab34ec1fac1 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@google.com>
Date: Sun, 19 Apr 2015 04:59:56 +0000
Subject: Revert "Add multi-sim support for getCarrierPackageNamesForIntent."

This reverts commit 0ff9fd87d0a0d88bf46945629d0a30f6e7fb3f55.

Change-Id: I099c612ff1715c5c34c0ed9bc1bec460a1a5db01
---
 telephony/java/android/telephony/TelephonyManager.java       | 12 +++---------
 .../java/com/android/internal/telephony/ITelephony.aidl      |  9 ++++-----
 2 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'telephony')

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 6eb87b5..128f6e3 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -3630,20 +3630,14 @@ public class TelephonyManager {
     /** @hide */
     @SystemApi
     public List<String> getCarrierPackageNamesForIntent(Intent intent) {
-        return getCarrierPackageNamesForIntentAndPhone(intent, getDefaultPhone());
-    }
-
-    /** @hide */
-    @SystemApi
-    public List<String> getCarrierPackageNamesForIntentAndPhone(Intent intent, int phoneId) {
         try {
             ITelephony telephony = getITelephony();
             if (telephony != null)
-                return telephony.getCarrierPackageNamesForIntentAndPhone(intent, phoneId);
+                return telephony.getCarrierPackageNamesForIntent(intent);
         } catch (RemoteException ex) {
-            Rlog.e(TAG, "getCarrierPackageNamesForIntentAndPhone RemoteException", ex);
+            Rlog.e(TAG, "getCarrierPackageNamesForIntent RemoteException", ex);
         } catch (NullPointerException ex) {
-            Rlog.e(TAG, "getCarrierPackageNamesForIntentAndPhone NPE", ex);
+            Rlog.e(TAG, "getCarrierPackageNamesForIntent NPE", ex);
         }
         return null;
     }
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index d24dba7..a24859b 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -740,16 +740,15 @@ interface ITelephony {
     int checkCarrierPrivilegesForPackage(String pkgname);
 
     /**
-     * Returns list of the package names of the carrier apps that should handle the input intent
-     * and have carrier privileges for the given phoneId.
+     * Returns the package name of the carrier apps that should handle the input intent.
      *
+     * @param packageManager PackageManager for getting receivers.
      * @param intent Intent that will be sent.
-     * @param phoneId The phoneId on which the carrier app has carrier privileges.
-     * @return list of carrier app package names that can handle the intent on phoneId.
+     * @return list of carrier app package names that can handle the intent.
      *         Returns null if there is an error and an empty list if there
      *         are no matching packages.
      */
-    List<String> getCarrierPackageNamesForIntentAndPhone(in Intent intent, int phoneId);
+    List<String> getCarrierPackageNamesForIntent(in Intent intent);
 
     /**
      * Set the line 1 phone number string and its alphatag for the current ICCID
-- 
cgit v1.1