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

Commit 259e3384 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 7e90005f: Merge change I705b1d33 into eclair 

Merge commit '7e90005f' into eclair-mr2

* commit '7e90005f':
  GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
parents 18ff0e32 7e90005f

location/java/com/android/internal/location/GpsLocationProvider.java

+34 −36
Original line number Diff line number Diff line
@@ -876,15 +876,12 @@ public class GpsLocationProvider extends ILocationProvider.Stub { 
            boolean wasNavigating = mNavigating;

            mNavigating = (status == GPS_STATUS_SESSION_BEGIN);



            if (wasNavigating == mNavigating) {

                return;

            }

            

            if (mNavigating) {

            if (mNavigating && !mWakeLock.isHeld()) {

                if (DEBUG) Log.d(TAG, "Acquiring wakelock");

                 mWakeLock.acquire();

            }



            if (wasNavigating != mNavigating) {

                int size = mListeners.size();

                for (int i = 0; i < size; i++) {

                    Listener listener = mListeners.get(i);
@@ -920,8 +917,9 @@ public class GpsLocationProvider extends ILocationProvider.Stub { 
                Intent intent = new Intent(GPS_ENABLED_CHANGE_ACTION);

                intent.putExtra(EXTRA_ENABLED, mNavigating);

                mContext.sendBroadcast(intent);

            }



            if (!mNavigating) {

            if (status == GPS_STATUS_ENGINE_OFF && mWakeLock.isHeld()) {

                if (DEBUG) Log.d(TAG, "Releasing wakelock");

                mWakeLock.release();

            }