commit 2ebc5d8af2a57b0cc7f6366c9ff233c91febbbce
author Jonathan Basseri <misterikkit@google.com> Wed Aug 19 02:21:13 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 19 02:21:13 2015 +0000
tree d988e6a5932694d5f9070c663bc288a992aae0f3
parent a5574ebbbfe62f292fdb96ed8f569af1d8bad4f0
parent 7819c108f04d39764a161e9b1d86effa6a540021

am 7819c108: am 50817295: am 20077cc3: am 1234ba4a: am 40473a53: Add safety check when binding to carrier app.

* commit '7819c108f04d39764a161e9b1d86effa6a540021':
  Add safety check when binding to carrier app.

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 2c2e095..09f12ff 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -259,8 +259,9 @@
                         newMsg.getData().putBoolean("loaded_from_xml", true);
                         sendMessage(newMsg);
                     } else {
-                        if (bindToConfigPackage(carrierPackageName, phoneId,
-                                EVENT_CONNECTED_TO_CARRIER)) {
+                        if (carrierPackageName != null
+                            && bindToConfigPackage(carrierPackageName, phoneId,
+                                    EVENT_CONNECTED_TO_CARRIER)) {
                             sendMessageDelayed(obtainMessage(EVENT_BIND_CARRIER_TIMEOUT, phoneId, -1),
                                     BIND_TIMEOUT_MILLIS);
                         } else {