From 6357ef788c564a0a3f92fc5761d7e0ecbf62c181 Mon Sep 17 00:00:00 2001
From: zachh <zachh@google.com>
Date: Tue, 5 Dec 2017 15:27:56 -0800
Subject: Check for null subscription info list in
 TelecomUtil#getSubscriptionInfo.

The javadoc for the method states that it can return null if the current state is unknown.

Bug: 70224613
Test: unit
PiperOrigin-RevId: 178020566
Change-Id: I4cd6f76b7c0572d1c9797eba4bf9c3981846468e
---
 java/com/android/dialer/telecom/TelecomUtil.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'java/com/android/dialer/telecom')

diff --git a/java/com/android/dialer/telecom/TelecomUtil.java b/java/com/android/dialer/telecom/TelecomUtil.java
index c79d9013d..6f424de4a 100644
--- a/java/com/android/dialer/telecom/TelecomUtil.java
+++ b/java/com/android/dialer/telecom/TelecomUtil.java
@@ -158,7 +158,11 @@ public abstract class TelecomUtil {
       return Optional.absent();
     }
     SubscriptionManager subscriptionManager = context.getSystemService(SubscriptionManager.class);
-    for (SubscriptionInfo info : subscriptionManager.getActiveSubscriptionInfoList()) {
+    List<SubscriptionInfo> subscriptionInfos = subscriptionManager.getActiveSubscriptionInfoList();
+    if (subscriptionInfos == null) {
+      return Optional.absent();
+    }
+    for (SubscriptionInfo info : subscriptionInfos) {
       if (phoneAccountHandle.getId().startsWith(info.getIccId())) {
         return Optional.of(info);
       }
-- 
cgit v1.2.3