diff options
author | Jeff Sharkey <jsharkey@google.com> | 2015-04-19 05:00:27 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-19 05:00:29 +0000 |
commit | 722743667110718acf473c92727b55581c0b9309 (patch) | |
tree | 4e7de22f31334e3ff11e511beb59ff5374fd5e2c /telephony | |
parent | 4cfb3130a4b057baba53926d6bb656aa8e9ef1d3 (diff) | |
parent | 1b7ed7b1c2224728340251eb19433ab34ec1fac1 (diff) | |
download | frameworks_base-722743667110718acf473c92727b55581c0b9309.zip frameworks_base-722743667110718acf473c92727b55581c0b9309.tar.gz frameworks_base-722743667110718acf473c92727b55581c0b9309.tar.bz2 |
Merge "Revert "Add multi-sim support for getCarrierPackageNamesForIntent.""
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 12 | ||||
-rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 9 |
2 files changed, 7 insertions, 14 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index c62197d..7c68de2 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3632,20 +3632,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 0bd3f1c..0b77c26 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -744,16 +744,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 |