Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06d206da authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert changes to StationaryThrottlingLocationProvider" into sc-qpr1-dev am: 7cb45200 

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

Change-Id: I78d66dbfb98d0bd8f5db7df46185cfe48a83279b
parents 5c574e39 7cb45200

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

+8 −17
Original line number Original line Diff line number Diff line
@@ -105,15 +105,20 @@ public final class StationaryThrottlingLocationProvider extends DelegateLocation 




        synchronized (mLock) {

        synchronized (mLock) {

            mDeviceIdleHelper.addListener(this);

            mDeviceIdleHelper.addListener(this);

            onDeviceIdleChanged(mDeviceIdleHelper.isDeviceIdle());

            mDeviceIdle = mDeviceIdleHelper.isDeviceIdle();

            mDeviceStationaryHelper.addListener(this);

            mDeviceStationary = false;

            mDeviceStationaryRealtimeMs = Long.MIN_VALUE;



            onThrottlingChangedLocked(false);

        }

        }

    }

    }





    @Override

    @Override

    protected void onStop() {

    protected void onStop() {

        synchronized (mLock) {

        synchronized (mLock) {

            mDeviceStationaryHelper.removeListener(this);

            mDeviceIdleHelper.removeListener(this);

            mDeviceIdleHelper.removeListener(this);

            onDeviceIdleChanged(false);





            mIncomingRequest = ProviderRequest.EMPTY_REQUEST;

            mIncomingRequest = ProviderRequest.EMPTY_REQUEST;

            mOutgoingRequest = ProviderRequest.EMPTY_REQUEST;

            mOutgoingRequest = ProviderRequest.EMPTY_REQUEST;
@@ -146,27 +151,13 @@ public final class StationaryThrottlingLocationProvider extends DelegateLocation 
            }

            }





            mDeviceIdle = deviceIdle;

            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);

            onThrottlingChangedLocked(false);

        }

        }

    }

    }

    }





    @Override

    @Override

    public void onDeviceStationaryChanged(boolean deviceStationary) {

    public void onDeviceStationaryChanged(boolean deviceStationary) {

        synchronized (mLock) {

        synchronized (mLock) {

            if (!mDeviceIdle) {

                // stationary detection is only registered while idle - ignore late notifications

                return;

            }



            if (mDeviceStationary == deviceStationary) {

            if (mDeviceStationary == deviceStationary) {

                return;

                return;

            }

            }