commit 40473a538d0b51b5d4e83421e06c99cbe05c2468
author Jonathan Basseri <misterikkit@google.com> Fri Aug 14 14:36:29 2015 -0700
committer Jonathan Basseri <misterikkit@google.com> Tue Aug 18 17:51:23 2015 +0000
tree 7bfb88038da99f1582b5f035453609fa1c3c8e49
parent 5cb43e447fef2dc48b07a21a602c1bef1079e365

Add safety check when binding to carrier app.

If a carrier app lost privilege at the same time we are fetching config
from it, there's a chance CarrierConfigLoader will use an invalid intent
to bind to the app, causing IllegalArgumentException.

This checks that the package name is not null just before use.

Bug: 23120391
Change-Id: I5bdf681b91509ec6c0937647c610959a2dd882b7

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 {