From 9b902f58e9a1a81376633d24d5360cf56071c56c Mon Sep 17 00:00:00 2001 From: twyen Date: Thu, 17 May 2018 17:19:33 -0700 Subject: Handle null returned from TelecomManager.getCallCapablePhoneAccounts() Usually it is non-null, but not true for some OEMs. TEST=TAP Bug: 73905236 Test: TAP PiperOrigin-RevId: 197076980 Change-Id: Ie58ecf2ab392e3393d190cefe9815b6bb8542800 --- java/com/android/dialer/telecom/TelecomUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (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 2608cb2aa..8c0090928 100644 --- a/java/com/android/dialer/telecom/TelecomUtil.java +++ b/java/com/android/dialer/telecom/TelecomUtil.java @@ -50,7 +50,7 @@ import java.util.concurrent.ConcurrentHashMap; * perform the required check and return the fallback default if the permission is missing, * otherwise return the value from TelecomManager. */ -@SuppressWarnings("MissingPermission") +@SuppressWarnings({"MissingPermission", "Guava"}) public abstract class TelecomUtil { private static final String TAG = "TelecomUtil"; @@ -145,7 +145,8 @@ public abstract class TelecomUtil { public static List getCallCapablePhoneAccounts(Context context) { if (hasReadPhoneStatePermission(context)) { - return getTelecomManager(context).getCallCapablePhoneAccounts(); + return Optional.fromNullable(getTelecomManager(context).getCallCapablePhoneAccounts()) + .or(new ArrayList<>()); } return new ArrayList<>(); } -- cgit v1.2.3