diff options
| author | 2017-09-01 13:31:17 -0700 | |
|---|---|---|
| committer | 2017-09-01 13:31:17 -0700 | |
| commit | a8ce225ce792fd3ba1bb01de94ec9887a3d9619e (patch) | |
| tree | 2b184aa76935cd3d20bf36ce45b61d11f876aa67 | |
| parent | 668feb252a226f39acbad801bf8e256a04cb3e1f (diff) | |
Null Pointer Check on Sim Swap
Rare bug, nearby but distinct from 35485906
Bug: 35485906
Change-Id: I085c77d1e9e291b47ba15bf2c5cd154d085e14a4
Fixes: 63022420
Test: Build, basic GPS check and sim swaps
| -rw-r--r-- | services/core/java/com/android/server/location/GnssLocationProvider.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java index 436ea3cd720a..358c6e5508ed 100644 --- a/services/core/java/com/android/server/location/GnssLocationProvider.java +++ b/services/core/java/com/android/server/location/GnssLocationProvider.java @@ -536,7 +536,10 @@ public class GnssLocationProvider implements LocationProviderInterface { synchronized (mLock) { if (configManager != null) { PersistableBundle b = configManager.getConfig(); - isKeepLppProfile = b.getBoolean(CarrierConfigManager.KEY_PERSIST_LPP_MODE_BOOL); + if (b != null) { + isKeepLppProfile = + b.getBoolean(CarrierConfigManager.KEY_PERSIST_LPP_MODE_BOOL); + } } if (isKeepLppProfile) { // load current properties for the carrier |