commit 55e5d42f30d5df385bbc08553d33a4f4bfb961c3
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Feb 22 06:38:42 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 22 06:38:42 2024 +0000
tree 962e0592cf1ecff058e22c42c8c0d96792415a33
parent bd1fe2d379e27ad2fbde971a6aea77e1ae3ab953
parent d1323b8189a467584e4f2a6aab103122a9b13ee3

Merge "Check for Location Feature and GNSS HAL Support" into main

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 115421d..bcbd36c 100644
--- a/services/core/java/com/android/server/location/LocationManagerService.java
+++ b/services/core/java/com/android/server/location/LocationManagerService.java
@@ -1321,7 +1321,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)
@@ -1336,7 +1338,10 @@
                     "isAutomotiveGnssSuspended only allowed on automotive devices");
         }
 
-        return mGnssManagerService.isAutomotiveGnssSuspended();
+        if (mGnssManagerService != null) {
+              return mGnssManagerService.isAutomotiveGnssSuspended();
+        }
+        return false;
     }
 
     @Override