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 a6ae9fc480bd9937abcc996d751f11453f3bfe57..ff776358436699ef976b692a8cea71d98cfdbeea 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,7 +23,6 @@ |
import android.os.SystemClock; |
import org.webrtc.Logging; |
-import org.webrtc.ThreadUtils; |
class WebRtcAudioRecord { |
private static final boolean DEBUG = false; |
@@ -104,8 +103,12 @@ |
public void joinThread() { |
keepAlive = false; |
- if (!ThreadUtils.joinUninterruptibly(this, 1000)) { |
- Logging.e(TAG, "Timeout in WebRtcAudioRecord.joinThread()"); |
+ while (isAlive()) { |
+ try { |
+ join(); |
+ } catch (InterruptedException e) { |
+ // Ignore. |
+ } |
} |
} |
} |