diff options
| author | 2017-09-01 23:54:04 +0000 | |
|---|---|---|
| committer | 2017-09-01 23:54:04 +0000 | |
| commit | e654f5e5c0286a69f9ee060ffc12ff5aa16767af (patch) | |
| tree | 76480bd46e5aa3be5fa3c009d9b04faf25d97cb5 | |
| parent | 5ad90adfd7a950081dd74c37fdd67728c4586dac (diff) | |
| parent | a8ce225ce792fd3ba1bb01de94ec9887a3d9619e (diff) | |
Merge "Null Pointer Check on Sim Swap"
| -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 f549a86583c0..0aa6a90e3efb 100644 --- a/services/core/java/com/android/server/location/GnssLocationProvider.java +++ b/services/core/java/com/android/server/location/GnssLocationProvider.java @@ -539,7 +539,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 |