Condelab
diff --git a/‎android/src/main/java/com/cloudwebrtc/webrtc/FlutterWebRTCPlugin.java
Lines changed: 22 additions & 6 deletions b/‎android/src/main/java/com/cloudwebrtc/webrtc/FlutterWebRTCPlugin.java
Lines changed: 22 additions & 6 deletions
diff --git a/‎android/src/main/java/com/cloudwebrtc/webrtc/PeerConnectionObserver.java
Lines changed: 2 additions & 1 deletion b/‎android/src/main/java/com/cloudwebrtc/webrtc/PeerConnectionObserver.java
Lines changed: 2 additions & 1 deletion
@@ -127,6 +127,11 @@ private FlutterWebRTCPlugin(Registrar registrar, MethodChannel channel) {
                 .setVideoDecoderFactory(new DefaultVideoDecoderFactory(eglContext))
                 .setAudioDeviceModule(audioDeviceModule)
                 .createPeerConnectionFactory();
+    }
+
+    private void startAudioManager() {
+        if(rtcAudioManager != null)
+            return;
 
         rtcAudioManager = RTCAudioManager.create(registrar.context());
         // Store existing audio settings and change audio mode to
@@ -141,12 +146,14 @@ public void onAudioDeviceChanged(
                 onAudioManagerDevicesChanged(audioDevice, availableAudioDevices);
             }
         });
-        /*
-        if (audioManager != null) {
-            audioManager.stop();
-            audioManager = null;
+    }
+
+    private void stopAudioManager() {
+        if (rtcAudioManager != null) {
+            Log.d(TAG, "Stoping the audio manager...");
+            rtcAudioManager.stop();
+            rtcAudioManager = null;
         }
-        */
     }
 
     // This method is called when the audio manager reports audio device change,
@@ -297,7 +304,7 @@ public void onMethodCall(MethodCall call, Result notSafeResult) {
             result.success(null);
         } else if(call.method.equals("peerConnectionDispose")){
             String peerConnectionId = call.argument("peerConnectionId");
-            peerConnectionClose(peerConnectionId);
+            peerConnectionDispose(peerConnectionId);
             result.success(null);
         }else if (call.method.equals("createVideoRenderer")) {
             TextureRegistry.SurfaceTextureEntry entry = textures.createSurfaceTexture();
@@ -362,6 +369,9 @@ public void onMethodCall(MethodCall call, Result notSafeResult) {
             result.success(null);
         } else if (call.method.equals("enableSpeakerphone")) {
             boolean enable = call.argument("enable");
+            if(rtcAudioManager == null ){
+                startAudioManager();
+            }
             rtcAudioManager.setSpeakerphoneOn(enable);
             result.success(null);
         } else if(call.method.equals("getDisplayMedia")) {
@@ -723,6 +733,9 @@ public String peerConnectionInit(
                 parseMediaConstraints(constraints),
                 observer);
         observer.setPeerConnection(peerConnection);
+        if(mPeerConnectionObservers.size() == 0) {
+            startAudioManager();
+        }
         mPeerConnectionObservers.put(peerConnectionId, observer);
         return peerConnectionId;
     }
@@ -1285,6 +1298,9 @@ public void peerConnectionDispose(final String id) {
             pco.dispose();
             mPeerConnectionObservers.remove(id);
         }
+        if(mPeerConnectionObservers.size() == 0) {
+            stopAudioManager();
+        }
     }
 
     public void mediaStreamRelease(final String id) {
 
@@ -82,7 +82,8 @@ void close() {
         remoteTracks.clear();
         dataChannels.clear();
     }
-    void  dispose(){
+
+    void  dispose() {
         this.close();
         peerConnection.dispose();
         eventChannel.setStreamHandler(null);