Merge "[Settings] Add NPE protection for the bundle"
This commit is contained in:
committed by
Android (Google) Code Review
commit
ec12b84624
@@ -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*/);
|
||||||
|
Reference in New Issue
Block a user