Merge change 368 into donut (3a86d334) · Commits · e / os / android_frameworks_base

services/java/com/android/server/LocationManagerService.java

+12 −4

Original line number	Diff line number	Diff line
		@@ -1831,9 +1831,13 @@ public class LocationManagerService extends ILocationManager.Stub {
		mWakeLockAcquireTime = SystemClock.elapsedRealtime();
		log("Acquired wakelock");

		if (mNetworkLocationProvider != null) {
		mNetworkLocationProvider.wakeLockAcquired();
		}
		if (mGpsLocationProvider != null) {
		mGpsLocationProvider.wakeLockAcquired();
		}
		}

		private void releaseWakeLockLocked() {
		try {
		@@ -1846,8 +1850,12 @@ public class LocationManagerService extends ILocationManager.Stub {
		}

		private void releaseWakeLockXLocked() {
		if (mNetworkLocationProvider != null) {
		mNetworkLocationProvider.wakeLockReleased();
		}
		if (mGpsLocationProvider != null) {
		mGpsLocationProvider.wakeLockReleased();
		}

		// Release wake lock
		mWakeLockAcquireTime = 0;