diff options
| author | Roshan Pius <rpius@google.com> | 2020-01-30 06:51:49 -0800 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2020-01-30 06:55:02 -0800 |
| commit | a65b49acda4d9c85e753e61a56478a5c7b767e8a (patch) | |
| tree | baf2da0a9f8a9f8ebc6056448990f21601271396 | |
| parent | c2e08a25fc459ac7eefe3214062d68e29602778b (diff) | |
WifiServiceImpl: Check for null pointer in updateSoftApCapability
Bug: 148529714
Test: Compiles
Change-Id: I6ff7a1046416602b838e8adfe73c79d2ec968e8d
| -rw-r--r-- | service/java/com/android/server/wifi/WifiServiceImpl.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index 59df14e69..bddb34daa 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -1031,11 +1031,9 @@ public class WifiServiceImpl extends BaseWifiService { CarrierConfigManager carrierConfigManager = (CarrierConfigManager) mContext.getSystemService( Context.CARRIER_CONFIG_SERVICE); - if (carrierConfigManager == null) { - return; - } - PersistableBundle carrierConfig = carrierConfigManager.getConfigForSubId( - subId); + if (carrierConfigManager == null) return; + PersistableBundle carrierConfig = carrierConfigManager.getConfigForSubId(subId); + if (carrierConfig == null) return; int carrierMaxClient = carrierConfig.getInt( CarrierConfigManager.Wifi.KEY_HOTSPOT_MAX_CLIENT_COUNT); int finalSupportedClientNumber = mContext.getResources().getInteger( |