commit b40f75e427b2a751ad537988664c6fc0e0759235
author henrika <henrika@webrtc.org> Thu Jan 09 14:18:12 2020
committer Commit Bot <commit-bot@chromium.org> Thu Jan 09 15:02:16 2020
tree 1599c22aaf430727cb12b5eb95bd789c3739dc1f
parent 350a82aec3556cfab385e41b67ab4f26f2fb0151

Avoids crash in ADM for Android

Tbr: henrik.lundin
Bug: webrtc:11270
Change-Id: I1b3ad0afe3f5072ea4529e89729b087a4bd29fec
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/165396
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Commit-Queue: Henrik Andreassson <henrika@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30197}

sdk/android/src/java/org/webrtc/audio/WebRtcAudioRecord.java

diff --git a/sdk/android/src/java/org/webrtc/audio/WebRtcAudioRecord.java b/sdk/android/src/java/org/webrtc/audio/WebRtcAudioRecord.java
index 42570d8..b7b78f7 100644
--- a/sdk/android/src/java/org/webrtc/audio/WebRtcAudioRecord.java
+++ b/sdk/android/src/java/org/webrtc/audio/WebRtcAudioRecord.java
@@ -426,6 +426,9 @@
       Logging.w(TAG, "AudioManager#getActiveRecordingConfigurations() requires N or higher");
       return 0;
     }
+    if (audioRecord == null) {
+      return 0;
+    }
     // Get a list of the currently active audio recording configurations of the device (can be more
     // than one). An empty list indicates there is no recording active when queried.
     List<AudioRecordingConfiguration> configs = audioManager.getActiveRecordingConfigurations();