From ef7ac4084e9d396e2b96a07faaccd232eca15648 Mon Sep 17 00:00:00 2001
From: twyen <twyen@google.com>
Date: Tue, 5 Jun 2018 11:18:37 -0700
Subject: Handle null carrier config for emergency call hint

getCarrierConfig() is @Nullable. While the default implementation always return a bundle, this is not true for other carrier apps.

ShadowTelephonyManager.getCarrierConfig() now return null as default to catch this behavior.

TEST=TAP
Bug: 80629471
Test: TAP
PiperOrigin-RevId: 199327865
Change-Id: I7416bee3d5f5307919c6825fc74c26f25b6b001f
---
 java/com/android/voicemail/impl/OmtpVvmCarrierConfigHelper.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'java/com/android/voicemail')

diff --git a/java/com/android/voicemail/impl/OmtpVvmCarrierConfigHelper.java b/java/com/android/voicemail/impl/OmtpVvmCarrierConfigHelper.java
index 3b97e3d8e..5185b8fd4 100644
--- a/java/com/android/voicemail/impl/OmtpVvmCarrierConfigHelper.java
+++ b/java/com/android/voicemail/impl/OmtpVvmCarrierConfigHelper.java
@@ -458,6 +458,9 @@ public class OmtpVvmCarrierConfigHelper {
     }
 
     PersistableBundle config = telephonyManager.getCarrierConfig();
+    if (config == null) {
+      return null;
+    }
 
     if (TextUtils.isEmpty(config.getString(CarrierConfigManager.KEY_VVM_TYPE_STRING))) {
       return null;
-- 
cgit v1.2.3