commit 31e0f961839161a12f2bc0892c6b4261697d5781
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Feb 22 08:03:39 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 22 08:03:39 2024 +0000
tree ae46590c2168cc5f17d625e12523b992ceafd70b
parent 2962a6244fd40d53505273adcd2645b88d5fdbc9
parent 198af4b6c808027ced2b4a3ecca74f41b4eeb0e4

Merge "Check for Location Feature and GNSS HAL Support" into main am: 55e5d42f30 am: 198af4b6c8

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

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

services/core/java/com/android/server/location/LocationManagerService.java

diff --git a/services/core/java/com/android/server/location/LocationManagerService.java b/services/core/java/com/android/server/location/LocationManagerService.java
index c5f3855..75be068 100644
--- a/services/core/java/com/android/server/location/LocationManagerService.java
+++ b/services/core/java/com/android/server/location/LocationManagerService.java
@@ -1346,7 +1346,9 @@
                     "setAutomotiveGnssSuspended only allowed on automotive devices");
         }
 
-        mGnssManagerService.setAutomotiveGnssSuspended(suspended);
+        if (mGnssManagerService != null) {
+              mGnssManagerService.setAutomotiveGnssSuspended(suspended);
+        }
     }
 
     @android.annotation.EnforcePermission(android.Manifest.permission.CONTROL_AUTOMOTIVE_GNSS)
@@ -1361,7 +1363,10 @@
                     "isAutomotiveGnssSuspended only allowed on automotive devices");
         }
 
-        return mGnssManagerService.isAutomotiveGnssSuspended();
+        if (mGnssManagerService != null) {
+              return mGnssManagerService.isAutomotiveGnssSuspended();
+        }
+        return false;
     }
 
     @Override