summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kevin Rocard <krocard@google.com> 2019-05-02 17:56:13 -0700
committer Kevin Rocard <krocard@google.com> 2019-05-08 23:37:31 +0000
commitb14fdecc4e54b07591cec17661d299e4e097ae9c (patch)
tree8a7c4c8d77a8d38a45ae0d8a91bca95fc0e9ded4
parent3a80d7f0038cc9d749f28e465e3f01a36425b8ff (diff)
Do not try to unregister APC multiple time
If audioRecord.release() is called explicitly, APC DP is released. When the AudioRecord.finalizer() is called by the JVM, the APC DP would be released again, leading to misleading error message. Bug: 131064451 Test: call AudioRecord release and check that the finalizer do not log a release failure Change-Id: Ia7092274ea8ac8e0a6754dfe2541f823f650384d Signed-off-by: Kevin Rocard <krocard@google.com>
-rw-r--r--media/java/android/media/AudioRecord.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java
index eeb7655abff9..ce9b07dd0c0e 100644
--- a/media/java/android/media/AudioRecord.java
+++ b/media/java/android/media/AudioRecord.java
@@ -838,6 +838,7 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection,
}
if (mAudioCapturePolicy != null) {
AudioManager.unregisterAudioPolicyAsyncStatic(mAudioCapturePolicy);
+ mAudioCapturePolicy = null;
}
native_release();
mState = STATE_UNINITIALIZED;