Merge "Fix deadlock by not acquiring lock when reporting proximity" (c9493fca) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/attention/AttentionManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -668,8 +668,8 @@ public class AttentionManagerService extends SystemService {
		mIProximityUpdateCallback = new IProximityUpdateCallback.Stub() {
		@Override
		public void onProximityUpdate(double distance) {
		synchronized (mLock) {
		mCallbackInternal.onProximityUpdate(distance);
		synchronized (mLock) {
		freeIfInactiveLocked();
		}
		}