| commit | 1d2eb44eef5ff0ac24cc9f45d555b45f8d92e9eb | [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 | 11220a833f9812b86650c95ccc27931bbc57a0c1 | |
| parent | 051ac6b6129a336405a1e43ee7183d9db62cbdc9 [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: Ic9ab4768d744fc3fcf9a847dbc507e4341438b22