From 3892fc0349a91097f53152eaf2801dfebb2066ca Mon Sep 17 00:00:00 2001 From: Diego Pontoriero Date: Thu, 28 Aug 2014 11:49:44 -0700 Subject: [PATCH] Change TelephonyManager method name to accurately reflect functionality. Bug: 17163860 Change-Id: I4390d79c49831454146a42b89520a16984c5f260 --- services/core/java/com/android/server/ConnectivityService.java | 2 +- telephony/java/android/telephony/TelephonyManager.java | 8 ++++---- telephony/java/com/android/internal/telephony/ITelephony.aidl | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 107bb06ee4d7..0919f77b4371 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -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 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."); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 71b796ac67a1..cdee3de0e4e9 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3105,13 +3105,13 @@ public class TelephonyManager { /** @hide */ @SystemApi - public List getCarrierPackageNamesForBroadcastIntent(Intent intent) { + public List 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; } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index b1c3c4ab4f3e..5c3dcdb07fd5 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -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 getCarrierPackageNamesForBroadcastIntent(in Intent intent); + List getCarrierPackageNamesForIntent(in Intent intent); /** * Set whether Android should display a simplified Mobile Network Settings UI. -- 2.11.0