| commit | 7341c75feacf6c45f52c9f53b31ead8bc57d973a | [log] [tgz] |
|---|---|---|
| author | Dichen Zhang <dichenzhang@google.com> | Wed Jun 19 01:55:54 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 19 01:55:54 2019 -0700 |
| tree | 9735e91dfc7f8e812e873ca8c67cdafc89ad91d6 | |
| parent | bd1756ea2f02d5b5d06fc883a7da6f3e8d2e032f [diff] | |
| parent | 51dbe4829ebbe226af6c837b65bef1f0ea58000e [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: 51dbe4829e Change-Id: I948e76bd926d2a8165196149c75697f7b96e5f6e