commit | a17b14eb92f6c21a9cea97ed0ca30df74da9fc29 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Jun 17 01:51:06 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Jun 17 01:51:07 2017 +0000 |
tree | 55a0948aaa76e5d270540f7b39d5927f6ba2c80b | |
parent | 4e623e259c3e8677d57f761a3708423fb2e77e2a [diff] | |
parent | 515dc9c538b8206b746eeb4906ac0b8aed1fb497 [diff] |
Merge changes from topic 'layer-wp-race' into oc-dev * changes: surfaceflinger: Layer::getParent requires state lock held surfaceflinger: distinguish mCurrentParent/mDrawingParent surfaceflinger: protect Client::mParentLayer with a lock