commit fca8a8daba0c2333fbe4ab0c4acca463a0f754a0
author Zach Johnson <zachoverflow@google.com> Fri Jun 19 18:21:37 2015 -0700
committer Zach Johnson <zachoverflow@google.com> Tue Jun 23 14:34:41 2015 -0700
tree 8d5c6329d2f09956532a97081d97336463099dd7
parent 84974ff246c24a5c65b5f9cd97f5f55d32a67fbf

Update CarrierService API usage

CONFIG_SERVICE_INTERFACE -> CARRIER_SERVICE_INTERFACE

b/21080696

Change-Id: Icf51d8cdc07788d374d632bc22222899cecb5f6c

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index d5db212..5130a83 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -358,7 +358,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.CONFIG_SERVICE_INTERFACE);
+        Intent carrierService = new Intent(CarrierService.CARRIER_SERVICE_INTERFACE);
         carrierService.setPackage(pkgName);
         mServiceConnection[phoneId] = new CarrierServiceConnection(phoneId, eventId);
         try {
@@ -396,7 +396,7 @@
     private String getCarrierPackageForPhoneId(int phoneId) {
         List<String> carrierPackageNames = TelephonyManager.from(mContext)
                 .getCarrierPackageNamesForIntentAndPhone(
-                        new Intent(CarrierService.CONFIG_SERVICE_INTERFACE), phoneId);
+                        new Intent(CarrierService.CARRIER_SERVICE_INTERFACE), phoneId);
         if (carrierPackageNames != null && carrierPackageNames.size() > 0) {
             return carrierPackageNames.get(0);
         } else {