commit 0bdd55b3197debd0c781ee7d18753cd7f78917fa
author Junda Liu <junda@google.com> Mon May 04 14:32:58 2015 -0700
committer Junda Liu <junda@google.com> Mon May 04 14:32:58 2015 -0700
tree 7ee49ff09f934527e47ce703dfc9f240b721aca5
parent 2483f43383186be951f2cda1013e4d0396396cb7

Support phoneId when querying carrier packages.

Bug: b/20268073
Change-Id: Ibadf0d7bdbf3a9be65f4d22656d3bfcd693d4b9b

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index c6a1921..199c942 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -157,7 +157,8 @@
                         break;
                     }
                     List<String> carrierPackageNames = TelephonyManager.from(mContext)
-                            .getCarrierPackageNamesForIntent(new Intent(CarrierConfigService.SERVICE_INTERFACE));
+                            .getCarrierPackageNamesForIntentAndPhone(
+                                    new Intent(CarrierConfigService.SERVICE_INTERFACE), phoneId);
                     log("Found carrier config app: " + carrierPackageNames);
                     if (carrierPackageNames != null && carrierPackageNames.size() > 0) {
                         if (!bindToConfigPackage(carrierPackageNames.get(0),