tree c44138c276d2949ade76552b1d1e47740102ef58
parent 6ce715b696f25fd1f0463f4ef8a7650622079d90
parent 932f63ef1219deb522f094c4cf8f1223a7fb38c2
author TreeHugger Robot <treehugger-gerrit@google.com> 1560933400 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1560933400 +0000

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