commit c0d78c2105aca43e10a6265e7197d844b52d00ab
author Zhou Song <zhous@codeaurora.org> Mon Jun 16 10:48:22 2014 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Aug 28 04:08:45 2014 -0700
tree d27c84ec635bb5f0a8b37a8904c7ac41a5a96a15
parent ffa04fb4e3c8b64d505669896259839ae5544b49

audio_policy: force cancel unexecuted device routing command

-unexecuted device routing command can be handled for a none active
 output and cause wrong audio routing for the other active output
-cancel the pending device routing command if stream is voice call
 and new device is none

Change-Id: Ia5aeb935ccbdcb63fe8b226f911d252f78e2fa9b
CRs-Fixed: 678582

policy_hal/AudioPolicyManager.h

diff --git a/policy_hal/AudioPolicyManager.h b/policy_hal/AudioPolicyManager.h
index 9f2b473..d5cb6c1 100644
--- a/policy_hal/AudioPolicyManager.h
+++ b/policy_hal/AudioPolicyManager.h
@@ -58,6 +58,10 @@
                                                     AudioSystem::OUTPUT_FLAG_INDIRECT,
                                             const audio_offload_info_t *offloadInfo = NULL);
 
+        virtual status_t stopOutput(audio_io_handle_t output,
+                                    AudioSystem::stream_type stream,
+                                    int session = 0);
+
         virtual bool isOffloadSupported(const audio_offload_info_t& offloadInfo);
 
         virtual void setPhoneState(int state);
@@ -103,6 +107,8 @@
         bool mHdmiAudioEvent;
 
 private:
+        void handleNotificationRoutingForStream(AudioSystem::stream_type stream);
+
         // Used for voip + voice concurrency usecase
         int mPrevPhoneState;
         static int mvoice_call_state;