aac160b107bada150bee880a298902d0ee5464d0 - platform_frameworks_base

commit	aac160b107bada150bee880a298902d0ee5464d0	[log] [tgz]
author	Ahan Wu <ahanwu@google.com>	Tue Sep 14 08:57:16 2021 -0800
committer	Wu Ahan <ahanwu@google.com>	Tue Nov 02 12:23:06 2021 +0000
tree	aa2764bea6a65def0e12a7f7b17adf94a74de795
parent	8361670412790336f213ebb9d35cc569590140cb [diff]

Remove deadlock path between InteractionJankMonitor and FrameTracker

A deadlock path is found:
- FrameTracker$1.lambda$surfaceDestroyed (held A)
- InteractionJankMonitor.end (held B) -> FrameTracker.end (wait for A)
- FrameTracker.end -> InteractionJankMonitor.handleCujEvents (wait for B)
This cl resolves this by using a single lock among monitor and tracker.

Bug: 197804653
Test: atest InteractionJankMonitorTest --rerun-until-failure 100
Test: atest FrameTrackerTest --rerun-until-failure 100
Change-Id: Ia6aa196370bdb51b8a5c84c74a3d174a3d4b689f

core/java/com/android/internal/jank/FrameTracker.java[diff]
core/java/com/android/internal/jank/InteractionJankMonitor.java[diff]
core/tests/coretests/src/com/android/internal/jank/InteractionJankMonitorTest.java[diff]

3 files changed