Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Unified Diff: webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java

Issue 1444313002: Adding thread timeout for audio recorer thread in Java (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Moved stuff around Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/java/src/org/webrtc/ThreadUtils.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java
diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java
index ff776358436699ef976b692a8cea71d98cfdbeea..a6ae9fc480bd9937abcc996d751f11453f3bfe57 100644
--- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java
+++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java
@@ -23,6 +23,7 @@ import android.os.Process;
import android.os.SystemClock;
import org.webrtc.Logging;
+import org.webrtc.ThreadUtils;
class WebRtcAudioRecord {
private static final boolean DEBUG = false;
@@ -103,12 +104,8 @@ class WebRtcAudioRecord {
public void joinThread() {
keepAlive = false;
- while (isAlive()) {
- try {
- join();
- } catch (InterruptedException e) {
- // Ignore.
- }
+ if (!ThreadUtils.joinUninterruptibly(this, 1000)) {
+ Logging.e(TAG, "Timeout in WebRtcAudioRecord.joinThread()");
}
}
}
« no previous file with comments | « webrtc/base/java/src/org/webrtc/ThreadUtils.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698