Commit fc230733 by Oliver Woodman

Ignore blockingSendMessage calls after release.

Previously we'd end up blocking forever in this case, which
is the worst thing we could do :). We could either throw an
exception or just print a warning. Printing a warning is more
in line with what other methods do (Handler prints a "sending
message to dead thread" warning).
parent da125bb5
...@@ -158,6 +158,10 @@ import java.util.List; ...@@ -158,6 +158,10 @@ import java.util.List;
public synchronized void blockingSendMessage(ExoPlayerComponent target, int messageType, public synchronized void blockingSendMessage(ExoPlayerComponent target, int messageType,
Object message) { Object message) {
if (released) {
Log.w(TAG, "Sent message(" + messageType + ") after release. Message ignored.");
return;
}
int messageNumber = customMessagesSent++; int messageNumber = customMessagesSent++;
handler.obtainMessage(MSG_CUSTOM, messageType, 0, Pair.create(target, message)).sendToTarget(); handler.obtainMessage(MSG_CUSTOM, messageType, 0, Pair.create(target, message)).sendToTarget();
while (customMessagesProcessed <= messageNumber) { while (customMessagesProcessed <= messageNumber) {
...@@ -170,17 +174,18 @@ import java.util.List; ...@@ -170,17 +174,18 @@ import java.util.List;
} }
public synchronized void release() { public synchronized void release() {
if (!released) { if (released) {
handler.sendEmptyMessage(MSG_RELEASE); return;
while (!released) { }
try { handler.sendEmptyMessage(MSG_RELEASE);
wait(); while (!released) {
} catch (InterruptedException e) { try {
Thread.currentThread().interrupt(); wait();
} } catch (InterruptedException e) {
Thread.currentThread().interrupt();
} }
internalPlaybackThread.quit();
} }
internalPlaybackThread.quit();
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment