commit c3d62f9950ad0cb402082f19ea856d13986c289b
author Andy Hung <hunga@google.com> Thu Mar 14 13:38:51 2019 -0700
committer Andy Hung <hunga@google.com> Thu Mar 14 16:05:27 2019 -0700
tree 13b8dbde4d5078a3e63b016adbb8c7d99aab32cc
parent 0a2fc30b155c92db29ed483f85c8e92c3c9cf85b

Do not count invalid or terminated tracks for audio session purposes.

Test: CTS audio effect tests. SoloTester.
Bug: 128623061
Change-Id: I3f8d34d82aec14fe6ac9496c0e02726d94acdf85

services/audioflinger/TrackBase.h

diff --git a/services/audioflinger/TrackBase.h b/services/audioflinger/TrackBase.h
index e23173f..4402d99 100644
--- a/services/audioflinger/TrackBase.h
+++ b/services/audioflinger/TrackBase.h
@@ -94,6 +94,9 @@
     virtual void        invalidate() { mIsInvalid = true; }
             bool        isInvalid() const { return mIsInvalid; }
 
+            void        terminate() { mTerminated = true; }
+            bool        isTerminated() const { return mTerminated; }
+
     audio_attributes_t  attributes() const { return mAttr; }
 
 #ifdef TEE_SINK
@@ -228,14 +231,6 @@
         return mState == STOPPING_2;
     }
 
-    bool isTerminated() const {
-        return mTerminated;
-    }
-
-    void terminate() {
-        mTerminated = true;
-    }
-
     // Upper case characters are final states.
     // Lower case characters are transitory.
     const char *getTrackStateString() const {