| commit | 4635f10b789810d2726d5936f921dcec557078da | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Fri Sep 01 11:27:13 2017 -0600 |
| committer | Jeff Sharkey <jsharkey@android.com> | Fri Sep 01 12:36:20 2017 -0600 |
| tree | 7a52027511398778d39d673265c97c004eb19424 | |
| parent | c1235a1ff202fddfa1df5ce5359555fbd9b47944 [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