Merge "CP StationaryThrottling bugfixes from SC QPR1" into main (be988cb1) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/location/provider/StationaryThrottlingLocationProvider.java

+16 −8

Original line number	Diff line number	Diff line
		@@ -109,20 +109,15 @@ public final class StationaryThrottlingLocationProvider extends DelegateLocation

		synchronized (mLock) {
		mDeviceIdleHelper.addListener(this);
		mDeviceIdle = mDeviceIdleHelper.isDeviceIdle();
		mDeviceStationaryHelper.addListener(this);
		mDeviceStationary = false;
		mDeviceStationaryRealtimeMs = Long.MIN_VALUE;

		onThrottlingChangedLocked(false);
		onDeviceIdleChanged(mDeviceIdleHelper.isDeviceIdle());
		}
		}

		@Override
		protected void onStop() {
		synchronized (mLock) {
		mDeviceStationaryHelper.removeListener(this);
		mDeviceIdleHelper.removeListener(this);
		onDeviceIdleChanged(false);

		mIncomingRequest = ProviderRequest.EMPTY_REQUEST;
		mOutgoingRequest = ProviderRequest.EMPTY_REQUEST;
		@@ -155,13 +150,26 @@ public final class StationaryThrottlingLocationProvider extends DelegateLocation
		}

		mDeviceIdle = deviceIdle;
		if (deviceIdle) {
		// device stationary helper will deliver an immediate listener update
		mDeviceStationaryHelper.addListener(this);
		} else {
		mDeviceStationaryHelper.removeListener(this);
		mDeviceStationary = false;
		mDeviceStationaryRealtimeMs = Long.MIN_VALUE;
		onThrottlingChangedLocked(false);
		}
		}
		}

		@Override
		public void onDeviceStationaryChanged(boolean deviceStationary) {
		synchronized (mLock) {
		if (!mDeviceIdle) {
		// stationary detection is only registered while idle - ignore late notifications
		return;
		}

		if (mDeviceStationary == deviceStationary) {
		return;
		}