Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add multi-sim support for getCarrierPackageNamesForIntent.

Browse Source 
Bug: b/20268073
Change-Id: Id100b7c4606287a1daa90092cd3c8a5a6519247d
This commit is contained in:
Junda Liu
2015-04-16 17:18:07 -07:00
parent 83ab3b44df
commit 0ff9fd87d0
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -3630,14 +3630,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;
}

9
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -740,15 +740,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