commit 5ef003b750ae5188c36d6512584da442be125148
author Phil Burk <philburk@google.com> Fri Jun 30 11:43:37 2017 -0700
committer Phil Burk <philburk@google.com> Sat Jul 01 03:29:28 2017 +0000
tree 60b325497093e81d50c9c535cc6fe061a1c9dab9
parent fef6b3d4fdd5dcde27e29990dec6ee226aa7b873

aaudio: disconnect when onTearDown() called

It will be called, for example, when switching from speaker to Bluetooth.

Bug: 62883778
Test: run a long app and switch to or from Bluetooth
Change-Id: Iafb9b52d85c30fee71de46abfb99a27a1daabf59

services/oboeservice/AAudioServiceStreamBase.cpp

diff --git a/services/oboeservice/AAudioServiceStreamBase.cpp b/services/oboeservice/AAudioServiceStreamBase.cpp
index c415f25..c4591b0 100644
--- a/services/oboeservice/AAudioServiceStreamBase.cpp
+++ b/services/oboeservice/AAudioServiceStreamBase.cpp
@@ -79,7 +79,7 @@
         mThreadEnabled.store(false);
         result = mAAudioThread.stop();
         if (result != AAUDIO_OK) {
-            processFatalError();
+            disconnect();
             return result;
         }
         sendServiceEvent(AAUDIO_SERVICE_EVENT_PAUSED);
@@ -96,7 +96,7 @@
         mThreadEnabled.store(false);
         result = mAAudioThread.stop();
         if (result != AAUDIO_OK) {
-            processFatalError();
+            disconnect();
             return result;
         }
         sendServiceEvent(AAUDIO_SERVICE_EVENT_STOPPED);
@@ -133,8 +133,11 @@
     ALOGD("AAudioServiceStreamBase::run() exiting ----------------");
 }
 
-void AAudioServiceStreamBase::processFatalError() {
-    sendServiceEvent(AAUDIO_SERVICE_EVENT_DISCONNECTED);
+void AAudioServiceStreamBase::disconnect() {
+    if (mState != AAUDIO_STREAM_STATE_DISCONNECTED) {
+        sendServiceEvent(AAUDIO_SERVICE_EVENT_DISCONNECTED);
+        mState = AAUDIO_STREAM_STATE_DISCONNECTED;
+    }
 }
 
 aaudio_result_t AAudioServiceStreamBase::sendServiceEvent(aaudio_service_event_t event,