summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--api/system-current.txt1
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java12
-rw-r--r--telephony/java/com/android/internal/telephony/ITelephony.aidl9
3 files changed, 15 insertions, 7 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 2f74005..5d08682 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -33212,6 +33212,7 @@ package android.telephony {
method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
method public int getCallState();
method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);
+ method public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int);
method public java.lang.String getCdmaMdn();
method public java.lang.String getCdmaMdn(int);
method public java.lang.String getCdmaMin();
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 6d763e7..ee7f0ea 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -3632,14 +3632,20 @@ 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.getCarrierPackageNamesForIntent(intent);
+ return telephony.getCarrierPackageNamesForIntentAndPhone(intent, phoneId);
} catch (RemoteException ex) {
- Rlog.e(TAG, "getCarrierPackageNamesForIntent RemoteException", ex);
+ Rlog.e(TAG, "getCarrierPackageNamesForIntentAndPhone RemoteException", ex);
} catch (NullPointerException ex) {
- Rlog.e(TAG, "getCarrierPackageNamesForIntent NPE", ex);
+ Rlog.e(TAG, "getCarrierPackageNamesForIntentAndPhone 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 73f38da..25fe97c 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -744,15 +744,16 @@ interface ITelephony {
int checkCarrierPrivilegesForPackage(String pkgname);
/**
- * Returns the package name of the carrier apps that should handle the input intent.
+ * Returns list of the package names of the carrier apps that should handle the input intent
+ * and have carrier privileges for the given phoneId.
*
- * @param packageManager PackageManager for getting receivers.
* @param intent Intent that will be sent.
- * @return list of carrier app package names that can handle the intent.
+ * @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.
* Returns null if there is an error and an empty list if there
* are no matching packages.
*/
- List<String> getCarrierPackageNamesForIntent(in Intent intent);
+ List<String> getCarrierPackageNamesForIntentAndPhone(in Intent intent, int phoneId);
/**
* Set the line 1 phone number string and its alphatag for the current ICCID