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

Commit 3892fc03 authored by Diego Pontoriero's avatar Diego Pontoriero
Browse files

Change TelephonyManager method name to accurately reflect functionality. 

Bug: 17163860
Change-Id: I4390d79c49831454146a42b89520a16984c5f260
parent 2ac81fbf

services/core/java/com/android/server/ConnectivityService.java

+1 −1
Original line number Diff line number Diff line
@@ -3559,7 +3559,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
            // Check for  apps that can handle provisioning first

            Intent provisioningIntent = new Intent(TelephonyIntents.ACTION_CARRIER_SETUP);

            List<String> carrierPackages =

                    mTelephonyManager.getCarrierPackageNamesForBroadcastIntent(provisioningIntent);

                    mTelephonyManager.getCarrierPackageNamesForIntent(provisioningIntent);

            if (carrierPackages != null && !carrierPackages.isEmpty()) {

                if (carrierPackages.size() != 1) {

                    if (DBG) log("Multiple matching carrier apps found, launching the first.");

telephony/java/android/telephony/TelephonyManager.java

+4 −4
Original line number Diff line number Diff line
@@ -3105,13 +3105,13 @@ public class TelephonyManager { 


    /** @hide */

    @SystemApi

    public List<String> getCarrierPackageNamesForBroadcastIntent(Intent intent) {

    public List<String> getCarrierPackageNamesForIntent(Intent intent) {

        try {

            return getITelephony().getCarrierPackageNamesForBroadcastIntent(intent);

            return getITelephony().getCarrierPackageNamesForIntent(intent);

        } catch (RemoteException ex) {

            Rlog.e(TAG, "getCarrierPackageNamesForBroadcastIntent RemoteException", ex);

            Rlog.e(TAG, "getCarrierPackageNamesForIntent RemoteException", ex);

        } catch (NullPointerException ex) {

            Rlog.e(TAG, "getCarrierPackageNamesForBroadcastIntent NPE", ex);

            Rlog.e(TAG, "getCarrierPackageNamesForIntent NPE", ex);

        }

        return null;

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -710,12 +710,12 @@ interface ITelephony { 
     * 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 broadcast.

     * @param intent Intent that will be sent.

     * @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> getCarrierPackageNamesForBroadcastIntent(in Intent intent);

    List<String> getCarrierPackageNamesForIntent(in Intent intent);



    /**

     * Set whether Android should display a simplified Mobile Network Settings UI.