From 6c255cfe8ca8669e1091893ec72706a89616fa31 Mon Sep 17 00:00:00 2001
From: henrika <henrika@webrtc.org>
Date: Mon, 11 Dec 2017 16:06:36 +0100
Subject: [PATCH] Clears direct_buffer_address_ when init recording fails on
 Android.

Avoids hitting a DCHECK in AudioRecordJni::OnCacheDirectBufferAddress()
when first init attempt has failed and we try again.

Bug: b/69434512
Change-Id: I4396ba22981d9258d6d72188bad66104255f19cf
Reviewed-on: https://webrtc-review.googlesource.com/31842
Reviewed-by: Alex Glaznev <glaznev@webrtc.org>
Commit-Queue: Henrik Andreassson <henrika@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21218}
---
 modules/audio_device/android/audio_record_jni.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/audio_device/android/audio_record_jni.cc b/modules/audio_device/android/audio_record_jni.cc
index 79f8c8b0f9..edf9e364d2 100644
--- a/modules/audio_device/android/audio_record_jni.cc
+++ b/modules/audio_device/android/audio_record_jni.cc
@@ -126,6 +126,7 @@ int32_t AudioRecordJni::InitRecording() {
   int frames_per_buffer = j_audio_record_->InitRecording(
       audio_parameters_.sample_rate(), audio_parameters_.channels());
   if (frames_per_buffer < 0) {
+    direct_buffer_address_ = nullptr;
     ALOGE("InitRecording failed!");
     return -1;
   }