summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/telecom
diff options
context:
space:
mode:
authorzachh <zachh@google.com>2017-12-05 15:27:56 -0800
committerCopybara-Service <copybara-piper@google.com>2017-12-07 11:05:49 -0800
commit6357ef788c564a0a3f92fc5761d7e0ecbf62c181 (patch)
treeb29b49545e0a4f2b137f9ab194251d61470d98c2 /java/com/android/dialer/telecom
parentc7ec1530095dd90c041d6b5d340e9e66056c3b3b (diff)
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
Diffstat (limited to 'java/com/android/dialer/telecom')
-rw-r--r--java/com/android/dialer/telecom/TelecomUtil.java6
1 files changed, 5 insertions, 1 deletions
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);
}