Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug unregistering stationary listener" into sc-qpr1-dev am: eeff412d87

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15984062

Change-Id: I86a1e8f6222a2166906cd161f1c8aaca757c8a22
This commit is contained in:
TreeHugger Robot
2021-10-06 03:31:11 +00:00
committed by Automerger Merge Worker
parent e921c7a282 eeff412d87
commit 57b00da2e9
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/location/provider/StationaryThrottlingLocationProvider.java
View File

@@ -154,6 +154,7 @@ public final class StationaryThrottlingLocationProvider extends DelegateLocation
mDeviceStationaryHelper.removeListener(this);
mDeviceStationary = false;
mDeviceStationaryRealtimeMs = Long.MIN_VALUE;
onThrottlingChangedLocked(false);
}
}
}

25
services/tests/mockingservicestests/src/com/android/server/location/provider/StationaryThrottlingLocationProviderTest.java
View File

@@ -90,7 +90,7 @@ public class StationaryThrottlingLocationProviderTest {
}
@Test
public void testThrottle() {
public void testThrottle_stationaryExit() {
ProviderRequest request = new ProviderRequest.Builder().setIntervalMillis(50).build();
mProvider.getController().setRequest(request);
@@ -112,6 +112,29 @@ public class StationaryThrottlingLocationProviderTest {
verify(mListener, after(75).times(3)).onReportLocation(any(LocationResult.class));
}
@Test
public void testThrottle_idleExit() {
ProviderRequest request = new ProviderRequest.Builder().setIntervalMillis(50).build();
mProvider.getController().setRequest(request);
verify(mDelegate).onSetRequest(request);
mDelegateProvider.reportLocation(createLocationResult("test_provider", mRandom));
verify(mListener, times(1)).onReportLocation(any(LocationResult.class));
mInjector.getDeviceIdleHelper().setIdle(true);
verify(mDelegate, never()).onSetRequest(ProviderRequest.EMPTY_REQUEST);
mInjector.getDeviceStationaryHelper().setStationary(true);
verify(mDelegate).onSetRequest(ProviderRequest.EMPTY_REQUEST);
verify(mListener, timeout(75).times(2)).onReportLocation(any(LocationResult.class));
verify(mListener, timeout(75).times(3)).onReportLocation(any(LocationResult.class));
mInjector.getDeviceIdleHelper().setIdle(false);
verify(mDelegate, times(2)).onSetRequest(request);
verify(mListener, after(75).times(3)).onReportLocation(any(LocationResult.class));
}
@Test
public void testThrottle_NoInitialLocation() {
ProviderRequest request = new ProviderRequest.Builder().setIntervalMillis(50).build();