OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c1235a1) | patch
Don't over-acquire NPMS locks.
authorJeff Sharkey <jsharkey@android.com>
Fri, 1 Sep 2017 17:27:13 +0000 (11:27 -0600)
committerJeff Sharkey <jsharkey@android.com>
Fri, 1 Sep 2017 18:36:20 +0000 (12:36 -0600)
commit4635f10b789810d2726d5936f921dcec557078da
tree7a52027511398778d39d673265c97c004eb19424tree | snapshot
parentc1235a1ff202fddfa1df5ce5359555fbd9b47944commit | diff
Don't over-acquire NPMS locks.

We only need to hold mNetworkPoliciesSecondLock when working with
subscription plans; before this CL we could end up acquiring the two
NPMS locks out of order, resulting in a deadlock.

Also annotate objects in NSS that require mStatsLock to be held.

Test: builds, boots
Bug: 65268076
Change-Id: I06497564424316ef895dc8dceba72ae784781dc3
services/core/java/com/android/server/net/NetworkPolicyManagerService.java diff | blob | history
services/core/java/com/android/server/net/NetworkStatsService.java diff | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help