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()"); |
} |
} |
} |