diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-30 12:31:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-30 12:31:02 +0000 |
| commit | f902b3adf2f16ed868be771ea81db1ff6415b919 (patch) | |
| tree | e57d19180054b2d64eb2af66b01b0cb47e6a9f1d | |
| parent | 4c3abbf5e7ed9155298eff1d5244aa40bf51615b (diff) | |
| parent | be6deaced5fff95147483cdb4ff3c7c82004885b (diff) | |
| download | base-f902b3adf2f16ed868be771ea81db1ff6415b919.tar.gz | |
Merge "Gnss:fix NPE due to the arraymap store the null key." into main
| -rw-r--r-- | services/core/java/com/android/server/location/gnss/GnssConfiguration.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/location/gnss/GnssConfiguration.java b/services/core/java/com/android/server/location/gnss/GnssConfiguration.java index 5ef89ad4269a..ff16972438bd 100644 --- a/services/core/java/com/android/server/location/gnss/GnssConfiguration.java +++ b/services/core/java/com/android/server/location/gnss/GnssConfiguration.java @@ -379,7 +379,7 @@ public class GnssConfiguration { configs = CarrierConfigManager.getDefaultConfig(); } for (String configKey : configs.keySet()) { - if (configKey.startsWith(CarrierConfigManager.Gps.KEY_PREFIX)) { + if (configKey != null && configKey.startsWith(CarrierConfigManager.Gps.KEY_PREFIX)) { String key = configKey .substring(CarrierConfigManager.Gps.KEY_PREFIX.length()) .toUpperCase(); |