From 370e6599a1c9c8c8a78d291c445a667d0f7aa080 Mon Sep 17 00:00:00 2001 From: Sasha Kuznetsov Date: Fri, 14 Feb 2020 17:28:15 -0800 Subject: [PATCH] Fix GnssManagerServiceTest Test: atest GnssManagerServiceTest Change-Id: I3c8be6d1ea95a2755a20442ac265f2b5f4e35159 --- .../server/location/gnss/GnssManagerServiceTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/services/tests/servicestests/src/com/android/server/location/gnss/GnssManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/location/gnss/GnssManagerServiceTest.java index 4d0ad96ac2233..19cbb0e6e9b53 100644 --- a/services/tests/servicestests/src/com/android/server/location/gnss/GnssManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/location/gnss/GnssManagerServiceTest.java @@ -16,6 +16,8 @@ package com.android.server.location.gnss; +import static android.location.LocationManager.GPS_PROVIDER; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -293,6 +295,9 @@ public class GnssManagerServiceTest { } return AppOpsManager.MODE_ERRORED; }); + + when(mLocationManagerInternal.isProviderEnabledForUser(eq(GPS_PROVIDER), anyInt())) + .thenReturn(true); } private void disableLocationPermissions() { @@ -303,6 +308,9 @@ public class GnssManagerServiceTest { when(mAppOpsManager.checkOp(anyInt(), anyInt(), anyString())).thenReturn(AppOpsManager.MODE_ERRORED); + + when(mLocationManagerInternal.isProviderEnabledForUser(eq(GPS_PROVIDER), anyInt())) + .thenReturn(false); } private GnssStatusListenerHelper createGnssStatusListenerHelper(Context context, @@ -527,6 +535,7 @@ public class GnssManagerServiceTest { assertThrows(SecurityException.class, () -> mGnssManagerService.removeGnssBatchingCallback()); + enableLocationPermissions(); mGnssManagerService.onReportLocation(mockLocationList); verify(mockBatchedLocationCallback, times(1)).onLocationBatch(mockLocationList);