summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2014-09-19 11:14:12 -0400
committerPaul Jensen <pauljensen@google.com>2014-09-19 11:14:12 -0400
commitf9ee0e50545ba5e592147037f67155a29b3130ca (patch)
tree4bff7449065c38a539bf3296ff5b73beb3ad713e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentf5194d8cefc7b2eb078c08e3a8ef536d651b702d (diff)
Remove needless locking of mRulesLock that caused deadlocks.
The locks were added in c006f1 when underlying functions weren't performing locking. In d2a4587 the underlying functions were changed to perform locking but the higher level locking wasn't removed. The higher level locking can now cause deadlocks with the new NetworkAgentInfo locking. This change removes the needless higher level locking. Now all mRulesLock locking only guards simple accesses to the appropriate two data strucures so there is no chance of a deadlock. I verified that all accesses to the appropriate two data structures are guarded by mRulesLock locking. bug:17569997 Change-Id: Id9f4e3d19d6895876925ae32f12460db30359368
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions