diff options
| author | twyen <twyen@google.com> | 2018-06-05 11:18:37 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-06-05 12:57:09 -0700 |
| commit | ef7ac4084e9d396e2b96a07faaccd232eca15648 (patch) | |
| tree | 5ae162bfee7c99672f47a09a0969808409e9c31a /java/com/android/voicemail/impl | |
| parent | 9337f657f6c2890fd3d043b943da3234a7fa2d1f (diff) | |
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
Diffstat (limited to 'java/com/android/voicemail/impl')
| -rw-r--r-- | java/com/android/voicemail/impl/OmtpVvmCarrierConfigHelper.java | 3 |
1 files changed, 3 insertions, 0 deletions
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; |