Merge "Fix deadlock by not acquiring lock when reporting proximity"

2022-12-28 20:52:25 +00:00
parent 2eed02ebf9 a28af297d3
commit c9493fcace
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/attention/AttentionManagerService.java
+++ b/services/core/java/com/android/server/attention/AttentionManagerService.java
@@ -668,8 +668,8 @@ public class AttentionManagerService extends SystemService {
            mIProximityUpdateCallback = new IProximityUpdateCallback.Stub() {
                @Override
                public void onProximityUpdate(double distance) {
+                    mCallbackInternal.onProximityUpdate(distance);
                    synchronized (mLock) {
-                        mCallbackInternal.onProximityUpdate(distance);
                        freeIfInactiveLocked();
                    }
                }