Merge "Merge "Fix deadlock for system location clients" into rvc-dev am:... (b53bb948) · Commits · e / os / android_frameworks_base

location/java/android/location/LocationManager.java

+11 −9

Original line number	Original line	Diff line number	Diff line
	@@ -2583,9 +2583,15 @@ public class LocationManager {
	}		}

	public void cancel() {		public void cancel() {
			remove();
			}

			private Consumer<Location> remove() {
			Consumer<Location> consumer;
	ICancellationSignal cancellationSignal;		ICancellationSignal cancellationSignal;
	synchronized (this) {		synchronized (this) {
	mExecutor = null;		mExecutor = null;
			consumer = mConsumer;
	mConsumer = null;		mConsumer = null;

	if (mAlarmManager != null) {		if (mAlarmManager != null) {
	@@ -2605,6 +2611,8 @@ public class LocationManager {
	// ignore		// ignore
	}		}
	}		}

			return consumer;
	}		}

	public void fail() {		public void fail() {
	@@ -2663,18 +2671,12 @@ public class LocationManager {
	}		}

	private void acceptResult(Location location) {		private void acceptResult(Location location) {
	Consumer<Location> consumer;		Consumer<Location> consumer = remove();
	synchronized (this) {		if (consumer != null) {
	if (mConsumer == null) {
	return;
	}
	consumer = mConsumer;
	cancel();
	}

	consumer.accept(location);		consumer.accept(location);
	}		}
	}		}
			}

	private class LocationListenerTransport extends ILocationListener.Stub {		private class LocationListenerTransport extends ILocationListener.Stub {