Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f24126e authored by Jonathan Basseri's avatar Jonathan Basseri Committed by Android (Google) Code Review
Browse files

Merge "Add multi-sim support for getCarrierPackageNamesForIntent."

parents dcba951d f3c7bf43

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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();

telephony/java/android/telephony/TelephonyManager.java

+9 −3
Original line number Diff line number Diff line
@@ -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;

    }

telephony/java/com/android/internal/telephony/ITelephony.aidl

+5 −4
Original line number Diff line number Diff line
@@ -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