| commit | 51dbe4829ebbe226af6c837b65bef1f0ea58000e | [log] [tgz] |
|---|---|---|
| author | Dichen Zhang <dichenzhang@google.com> | Wed Jun 19 01:50:54 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 19 01:50:54 2019 -0700 |
| tree | 2b4c13883d1a11b1c153414c0079e1ad964358f1 | |
| parent | 79d3d51b744eb09077673d1ba7282718468d2c88 [diff] | |
| parent | c6ad7d76288ed155f63ba388b5ce1fb22d4ef261 [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 Change-Id: I3b5983b91cc69fef84b96ce40a3e0fba33bf314c