| commit | eee547970998370d60af6da58c61851cb6aaee2a | [log] [tgz] |
|---|---|---|
| author | Dichen Zhang <dichenzhang@google.com> | Wed Jun 19 02:01:50 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 19 02:01:50 2019 -0700 |
| tree | fc4d9151e77f863765e9b6a798eb6bf4f8845fcc | |
| parent | afba9a0bb62d6e371d16106ea7e7da2d81385af2 [diff] | |
| parent | e40a76a3714e9a60bc34a9f29e09559cbc0cbfd1 [diff] |
Merge "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: 51dbe4829e" into qt-r1-dev-plus-aosp am: e40a76a371 Change-Id: I3371140caeea8e6993f8fa5862191fba5d517d25