Merge "Fix GpsLocationProvider.enable/disable/isEnabled" (377fc095) · Commits · e / os / android_frameworks_base

services/java/com/android/server/location/GpsLocationProvider.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -704,17 +704,17 @@ public class GpsLocationProvider implements LocationProviderInterface {
		*/
		@Override
		public void enable() {
		synchronized (mLock) {
		if (mEnabled) return;
		mEnabled = true;
		}

		sendMessage(ENABLE, 1, null);
		}

		private void handleEnable() {
		if (DEBUG) Log.d(TAG, "handleEnable");

		synchronized (mLock) {
		if (mEnabled) return;
		mEnabled = true;
		}

		boolean enabled = native_init();

		if (enabled) {
		@@ -740,17 +740,17 @@ public class GpsLocationProvider implements LocationProviderInterface {
		*/
		@Override
		public void disable() {
		synchronized (mLock) {
		if (!mEnabled) return;
		mEnabled = false;
		}

		sendMessage(ENABLE, 0, null);
		}

		private void handleDisable() {
		if (DEBUG) Log.d(TAG, "handleDisable");

		synchronized (mLock) {
		if (!mEnabled) return;
		mEnabled = false;
		}

		stopNavigating();
		mAlarmManager.cancel(mWakeupIntent);
		mAlarmManager.cancel(mTimeoutIntent);