From 44bc703bf2eb2774e3bd93e820c340d624972864 Mon Sep 17 00:00:00 2001
From: Zoey Chen <zoeychen@google.com>
Date: Thu, 14 Jul 2022 08:32:02 +0000
Subject: [PATCH] [Settings] Add NPE protection for the bundle

Bug: 238980691
Test: atest MobileNetworkIntentConverterTest
Change-Id: I39d0f86725f6b0ef477425fb901bb274f31c6d78
---
 .../android/settings/network/telephony/MobileNetworkUtils.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index e769a4eed7d..548ce289c14 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -213,7 +213,7 @@ public class MobileNetworkUtils {
             return false;
         }
         PersistableBundle bundle = carrierConfigCache.getConfigForSubId(subId);
-        return bundle.getBoolean(
+        return bundle == null ? false : bundle.getBoolean(
                 CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/)
                 || bundle.getBoolean(CarrierConfigManager.Ims.KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL,
                 false /*default*/);