Merge "Revert "Add multi-sim support for getCarrierPackageNamesForIntent."" (72274366) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+3 −9

Original line number	Diff line number	Diff line
		@@ -3632,20 +3632,14 @@ 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.getCarrierPackageNamesForIntentAndPhone(intent, phoneId);
		return telephony.getCarrierPackageNamesForIntent(intent);
		} catch (RemoteException ex) {
		Rlog.e(TAG, "getCarrierPackageNamesForIntentAndPhone RemoteException", ex);
		Rlog.e(TAG, "getCarrierPackageNamesForIntent RemoteException", ex);
		} catch (NullPointerException ex) {
		Rlog.e(TAG, "getCarrierPackageNamesForIntentAndPhone NPE", ex);
		Rlog.e(TAG, "getCarrierPackageNamesForIntent NPE", ex);
		}
		return null;
		}

+4 −5

Original line number	Diff line number	Diff line
		@@ -744,16 +744,15 @@ interface ITelephony {
		int checkCarrierPrivilegesForPackage(String pkgname);

		/**
		* Returns list of the package names of the carrier apps that should handle the input intent
		* and have carrier privileges for the given phoneId.
		* 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 sent.
		* @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.
		* @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> getCarrierPackageNamesForIntentAndPhone(in Intent intent, int phoneId);
		List<String> getCarrierPackageNamesForIntent(in Intent intent);

		/**
		* Set the line 1 phone number string and its alphatag for the current ICCID