commit 797ea00bae36af60feadd8abc2bf1a30d5a770f7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Apr 30 12:50:29 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 30 12:50:29 2024 +0000
tree e57d19180054b2d64eb2af66b01b0cb47e6a9f1d
parent 4ba4bcf23c3baf681a155605335db1428c893f5b
parent f902b3adf2f16ed868be771ea81db1ff6415b919

Merge "Gnss:fix NPE due to the arraymap store the null key." into main am: f902b3adf2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3064570

Change-Id: I314d9e9e9bb39f3d278304b0864cfd5987e03430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/location/gnss/GnssConfiguration.java

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 5ef89ad..ff16972 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 @@
             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();