| commit | afba9a0bb62d6e371d16106ea7e7da2d81385af2 | [log] [tgz] |
|---|---|---|
| author | Dichen Zhang <dichenzhang@google.com> | Wed Jun 19 02:01:28 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 19 02:01:28 2019 -0700 |
| tree | fc4d9151e77f863765e9b6a798eb6bf4f8845fcc | |
| parent | d575d3a504f24330a4df102369ae5045e98e19aa [diff] | |
| parent | 5f3ca1c949ca1b72344174cbcdd2325103b289a9 [diff] |
Merge "NuPlayer::GenericSource::onPrepareAsync():Change lock order mLock and mDisconnect lock order interleaving, which has potential risk of deadlock if other code locks/unlocks them in a different order." into qt-dev am: c6ad7d7628 am: 1d2eb44eef am: 5f3ca1c949 Change-Id: Ia050d58b5b93a6375b0b17a1000d245789ec8cf6