Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix deadlock by not acquiring lock when reporting proximity" into tm-qpr-dev am: 73eea3903e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20840409

Change-Id: If536bb592e2af93706cabb9c3c1b9d4c50c415dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Kim
2022-12-30 11:33:19 +00:00
committed by Automerger Merge Worker
parent ed16314594 73eea3903e
commit a308ea5adb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/attention/AttentionManagerService.java
View File

@@ -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();
}
}