commit 69027fb2fbdb046467b8902ebc70120b89301cee
author Jonathan Basseri <misterikkit@google.com> Fri Aug 14 15:24:34 2015 -0700
committer Jonathan Basseri <misterikkit@google.com> Tue Aug 18 17:50:44 2015 +0000
tree 048b95e9af58447b9176bbe1c739591d6a06c15f
parent 7059f27ca9cc04743affc5ff631d85415e5a927e

Add null check

resolveService() is allowed to return null, so check the return value
before using it.

Bug: 23041089
Change-Id: I75af183d551770048fa925676b9adfbd078e22ba

src/java/com/android/internal/telephony/CarrierServiceBindHelper.java

diff --git a/src/java/com/android/internal/telephony/CarrierServiceBindHelper.java b/src/java/com/android/internal/telephony/CarrierServiceBindHelper.java
index 8675598..18e1554 100644
--- a/src/java/com/android/internal/telephony/CarrierServiceBindHelper.java
+++ b/src/java/com/android/internal/telephony/CarrierServiceBindHelper.java
@@ -187,7 +187,10 @@
 
             ResolveInfo carrierResolveInfo = mContext.getPackageManager().resolveService(
                 carrierService, PackageManager.GET_META_DATA);
-            Bundle metadata = carrierResolveInfo.serviceInfo.metaData;
+            Bundle metadata = null;
+            if (carrierResolveInfo != null) {
+              metadata = carrierResolveInfo.serviceInfo.metaData;
+            }
 
             // Only bind if the service wants it
             if (metadata == null ||