Merge "Fix deadlock by not acquiring lock when reporting proximity" into tm-qpr-dev
This commit is contained in:
@@ -668,8 +668,8 @@ public class AttentionManagerService extends SystemService {
|
|||||||
mIProximityUpdateCallback = new IProximityUpdateCallback.Stub() {
|
mIProximityUpdateCallback = new IProximityUpdateCallback.Stub() {
|
||||||
@Override
|
@Override
|
||||||
public void onProximityUpdate(double distance) {
|
public void onProximityUpdate(double distance) {
|
||||||
|
mCallbackInternal.onProximityUpdate(distance);
|
||||||
synchronized (mLock) {
|
synchronized (mLock) {
|
||||||
mCallbackInternal.onProximityUpdate(distance);
|
|
||||||
freeIfInactiveLocked();
|
freeIfInactiveLocked();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user