commit a9d689ffc1e09a20539d314f24b5ff3390e1e59e
author Zach Johnson <zachoverflow@google.com> Wed May 27 16:23:22 2015 -0700
committer Zach Johnson <zachoverflow@google.com> Wed May 27 16:23:22 2015 -0700
tree 5ac30764fd41ff189ee2e77287c68b584fb7c5f9
parent 36d7aab00cd08f9efded5148c8f8a42ed7402641

Update config loader to use CONFIG_SERVICE_INTERFACE

Change-Id: I3883e57abd25aeaf22af4f6f951b9ccf001a9911

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index ede032d..0c34c5f 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -183,7 +183,7 @@
                     }
                     List<String> carrierPackageNames = TelephonyManager.from(mContext)
                             .getCarrierPackageNamesForIntentAndPhone(
-                                    new Intent(CarrierService.SERVICE_INTERFACE), phoneId);
+                                    new Intent(CarrierService.CONFIG_SERVICE_INTERFACE), phoneId);
                     log("Found carrier config app: " + carrierPackageNames);
                     if (carrierPackageNames != null && carrierPackageNames.size() > 0) {
                         if (!bindToConfigPackage(carrierPackageNames.get(0),
@@ -278,7 +278,7 @@
     /** Binds to the default or carrier config app. */
     private boolean bindToConfigPackage(String pkgName, int phoneId, int eventId) {
         log("Binding to " + pkgName + " for phone " + phoneId);
-        Intent carrierService = new Intent(CarrierService.SERVICE_INTERFACE);
+        Intent carrierService = new Intent(CarrierService.CONFIG_SERVICE_INTERFACE);
         carrierService.setPackage(pkgName);
         mServiceConnection[phoneId] = new CarrierServiceConnection(phoneId, eventId);
         try {