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

Merge "Add multi-sim support for getCarrierPackageNamesForIntent."

Browse Source
This commit is contained in:
Jonathan Basseri
2015-04-20 19:59:37 +00:00
committed by Android (Google) Code Review
parent dcba951d54 f3c7bf432d
commit 5f24126e2e
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -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();

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

@@ -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;
}

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

@@ -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