| commit | 39219497460e51018e0e40e480629766ee726d36 | [log] [tgz] |
|---|---|---|
| author | Grace Cheng <gracemc@google.com> | Fri Oct 08 15:42:57 2021 -0700 |
| committer | Grace Cheng <gracemc@google.com> | Fri Oct 15 18:36:40 2021 +0000 |
| tree | 7186c8c771175ef585aab446323957657b4dbed9 | |
| parent | b4078937012115f3bee06083200479fa8334b82b [diff] |
Disables ADAS GNSS bypass for user 0 Bug: 201084725 Test: atest CarServiceUnitTest:CarUserServiceTest Change-Id: If8ed1547af20f83e37f6264471509e88455ccbef Merged-In: If8ed1547af20f83e37f6264471509e88455ccbef (cherry picked from commit 8a4627951a11f0e33242e3444d07cb421f776bd3)
diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java index 1fde509..2adbe79 100644 --- a/service/src/com/android/car/user/CarUserService.java +++ b/service/src/com/android/car/user/CarUserService.java
@@ -2250,6 +2250,7 @@ (LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE); locationManager.setLocationEnabledForUser( /* enabled= */ false, UserHandle.of(UserHandle.USER_SYSTEM)); + locationManager.setAdasGnssLocationEnabled(false); } /**
diff --git a/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java b/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java index 1685a71..e72df67 100644 --- a/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java +++ b/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java
@@ -417,6 +417,7 @@ sendUserUnlockedEvent(UserHandle.USER_SYSTEM); verify(mLocationManager).setLocationEnabledForUser( /* enabled= */ false, UserHandle.of(UserHandle.USER_SYSTEM)); + verify(mLocationManager).setAdasGnssLocationEnabled(false); } /**