| commit | e40a76a3714e9a60bc34a9f29e09559cbc0cbfd1 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Wed Jun 19 08:56:04 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 19 08:56:04 2019 +0000 |
| tree | 9735e91dfc7f8e812e873ca8c67cdafc89ad91d6 | |
| parent | 5f3ca1c949ca1b72344174cbcdd2325103b289a9 [diff] | |
| parent | 7341c75feacf6c45f52c9f53b31ead8bc57d973a [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