PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Settings] Add NPE protection for the bundle

Browse Source 
Bug: 238980691
Test: atest MobileNetworkIntentConverterTest
Change-Id: I39d0f86725f6b0ef477425fb901bb274f31c6d78
This commit is contained in:
Zoey Chen
2022-07-14 08:32:02 +00:00
parent 3d2e5a2447
commit 44bc703bf2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/telephony/MobileNetworkUtils.java
View File

@@ -213,7 +213,7 @@ public class MobileNetworkUtils {
return false; return false;
} }
PersistableBundle bundle = carrierConfigCache.getConfigForSubId(subId); PersistableBundle bundle = carrierConfigCache.getConfigForSubId(subId);
return bundle.getBoolean( return bundle == null ? false : bundle.getBoolean(
CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/) CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/)
|| bundle.getBoolean(CarrierConfigManager.Ims.KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL, || bundle.getBoolean(CarrierConfigManager.Ims.KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL,
false /*default*/); false /*default*/);