commit 38e65295fe289c63464fb16392f608d2959d3934
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 22 23:37:42 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 22 23:37:42 2018 +0000
tree f28a7a6b27554e0e825c97d6d85c0b8e2968cd91
parent cabd0fa1a5ab4f01b20b73c3a25533751edc03b2
parent f4cd3abc733004dd6de12c451c5eac5978c46154

Merge "Use the new scan API for manual network search."

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 5b9e638..c061fbc 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -155,15 +155,17 @@
                 SubscriptionManager.from(context).getActiveSubscriptionInfoList();
         // Check all active subscriptions. We only hide the button if it's disabled for all
         // active subscriptions.
-        for (SubscriptionInfo subInfo : sil) {
-            ImsManager imsManager = ImsManager.getInstance(context, subInfo.getSimSlotIndex());
-            PersistableBundle carrierConfig = PhoneGlobals.getInstance()
-                    .getCarrierConfigForSubId(subInfo.getSubscriptionId());
-            if ((imsManager.isVolteEnabledByPlatform()
-                    && imsManager.isVolteProvisionedOnDevice())
-                    || carrierConfig.getBoolean(
-                    CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL)) {
-                return false;
+        if (sil != null) {
+            for (SubscriptionInfo subInfo : sil) {
+                ImsManager imsManager = ImsManager.getInstance(context, subInfo.getSimSlotIndex());
+                PersistableBundle carrierConfig = PhoneGlobals.getInstance()
+                        .getCarrierConfigForSubId(subInfo.getSubscriptionId());
+                if ((imsManager.isVolteEnabledByPlatform()
+                        && imsManager.isVolteProvisionedOnDevice())
+                        || carrierConfig.getBoolean(
+                        CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL)) {
+                    return false;
+                }
             }
         }