diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2020-06-02 12:51:18 -0600 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2020-06-02 12:51:20 -0600 |
| commit | a7f0b62142e9187e594a0b815a81f8b73f1180a3 (patch) | |
| tree | bbe5db1712c9b1148ea814fecf6efbce64931b99 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | c37e9cfa4a652a4855f93e3b5cc87da09ba63917 (diff) | |
More AMS/UGMS lock detangling.
We've seen additional evidence of deadlock between AM and UGMS, so
this change explicitly detangles those two locks to ensure that we
never hold the UGMS lock while calling into AMS, and it adds explicit
validation that will immediately throw instead of waiting a lurking
deadlock to trigger.
This change adds explicit "locked" and "unlocked" tags to relevant
methods inside UGMS to make it easier to track locking dependencies.
It also buttons up internals to be "private", ensuring that all
external callers are routed through our LocalService interface;
this has some additional overhead for inner-class method dispatch,
but the added safety outweighs the cost.
Bug: 115619667, 157863128
Test: atest WmTests:ActivityStarterTests
Test: atest FrameworksServicesTests:com.android.server.uri
Test: atest CtsAppSecurityHostTestCases:android.appsecurity.cts.AppSecurityTests#testPermissionDiffCert
Test: atest CtsWindowManagerDeviceTestCases:CrossAppDragAndDropTests
Test: atest CtsWindowManagerDeviceTestCases:ActivityStarterTests
Change-Id: Ib9d466d6c9844d03626d8f0b30ca69a76d00f02f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions