Skip to content
Snippets Groups Projects
Commit 31e0f961 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

parents 2962a624 198af4b6
No related branches found
No related tags found
No related merge requests found
......@@ -1346,7 +1346,9 @@ public class LocationManagerService extends ILocationManager.Stub implements
"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 @@ public class LocationManagerService extends ILocationManager.Stub implements
"isAutomotiveGnssSuspended only allowed on automotive devices");
}
return mGnssManagerService.isAutomotiveGnssSuspended();
if (mGnssManagerService != null) {
return mGnssManagerService.isAutomotiveGnssSuspended();
}
return false;
}
@Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment