commit 1a6df6687048aa6449d469fdcb5b23e08585323b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Apr 30 13:08:22 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 30 13:08:22 2024 +0000
tree 607638471636b614101201450f1cb96391f9799a
parent d2225c27c61f090390585e28988be431bb4f2ae6
parent 797ea00bae36af60feadd8abc2bf1a30d5a770f7

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

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

Change-Id: I3cb2b1fe38104a0abb890f4bedbfc448ee882cd4
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 a5939e9..a439f16 100644
--- a/services/core/java/com/android/server/location/gnss/GnssConfiguration.java
+++ b/services/core/java/com/android/server/location/gnss/GnssConfiguration.java
@@ -386,7 +386,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(Locale.ROOT);