From 039083aedcd85b12f8fc2bb79b08b4500d29a4fb Mon Sep 17 00:00:00 2001
From: Sami Kalliomaki <sakal@webrtc.org>
Date: Thu, 30 Jun 2016 16:57:10 +0200
Subject: [PATCH] Dispose audio source correctly in AppRTC Demo on Android.

Call dispose method on audio source in PeerConnectionClient dispose
method.

R=magjed@webrtc.org

Review URL: https://codereview.webrtc.org/2117463002 .

Cr-Commit-Position: refs/heads/master@{#13348}
---
 .../appspot/apprtc/PeerConnectionClient.java    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
index e8e1f85039..294b1ef07b 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
@@ -10,12 +10,14 @@
 
 package org.appspot.apprtc;
 
+import org.appspot.apprtc.AppRTCClient.SignalingParameters;
+
 import android.content.Context;
-import android.os.ParcelFileDescriptor;
 import android.os.Environment;
+import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
-import org.appspot.apprtc.AppRTCClient.SignalingParameters;
+import org.webrtc.AudioSource;
 import org.webrtc.AudioTrack;
 import org.webrtc.CameraEnumerationAndroid;
 import org.webrtc.DataChannel;
@@ -96,6 +98,7 @@ public class PeerConnectionClient {
   private PeerConnectionFactory factory;
   private PeerConnection peerConnection;
   PeerConnectionFactory.Options options = null;
+  private AudioSource audioSource;
   private VideoSource videoSource;
   private boolean videoCallEnabled;
   private boolean preferIsac;
@@ -542,6 +545,11 @@ public class PeerConnectionClient {
       peerConnection.dispose();
       peerConnection = null;
     }
+    Log.d(TAG, "Closing audio source.");
+    if (audioSource != null) {
+      audioSource.dispose();
+      audioSource = null;
+    }
     Log.d(TAG, "Closing video source.");
     if (videoSource != null) {
       videoSource.dispose();
@@ -777,9 +785,8 @@ public class PeerConnectionClient {
   }
 
   private AudioTrack createAudioTrack() {
-    localAudioTrack = factory.createAudioTrack(
-        AUDIO_TRACK_ID,
-        factory.createAudioSource(audioConstraints));
+    audioSource = factory.createAudioSource(audioConstraints);
+    localAudioTrack = factory.createAudioTrack(AUDIO_TRACK_ID, audioSource);
     localAudioTrack.setEnabled(enableAudio);
     return localAudioTrack;
   }