diff options
| author | Leo Wang <leozwang@google.com> | 2015-01-15 06:03:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-15 06:03:13 +0000 |
| commit | 5b578beca7c835c0c49f8f93219cf4d2f82057e3 (patch) | |
| tree | 857ec8b1351715239ff138b1be2d717dcc68745b /services/audiopolicy | |
| parent | 5f3194c9efeadc200c89d9e2b00a19f1afeac55d (diff) | |
| parent | e6b8b27088f461957b4cbc51adbc8b01c41e9de2 (diff) | |
| download | frameworks_av-5b578beca7c835c0c49f8f93219cf4d2f82057e3.zip frameworks_av-5b578beca7c835c0c49f8f93219cf4d2f82057e3.tar.gz frameworks_av-5b578beca7c835c0c49f8f93219cf4d2f82057e3.tar.bz2 | |
Merge " [FM]There is no sound output from BT earphone while BT earphone is connected" into lmp-mr1-dev
Diffstat (limited to 'services/audiopolicy')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.h b/services/audiopolicy/AudioPolicyManager.h index 633888f..0fa182b 100644 --- a/services/audiopolicy/AudioPolicyManager.h +++ b/services/audiopolicy/AudioPolicyManager.h @@ -594,7 +594,7 @@ protected: // change the route of the specified output. Returns the number of ms we have slept to // allow new routing to take effect in certain cases. - uint32_t setOutputDevice(audio_io_handle_t output, + virtual uint32_t setOutputDevice(audio_io_handle_t output, audio_devices_t device, bool force = false, int delayMs = 0, @@ -877,11 +877,13 @@ protected: #endif //AUDIO_POLICY_TEST static float volIndexToAmpl(audio_devices_t device, const StreamDescriptor& streamDesc, int indexInUi); + static bool isVirtualInputDevice(audio_devices_t device); + uint32_t nextUniqueId(); + uint32_t nextAudioPortGeneration(); private: // updates device caching and output for streams that can influence the // routing of notifications void handleNotificationRoutingForStream(audio_stream_type_t stream); - static bool isVirtualInputDevice(audio_devices_t device); static bool deviceDistinguishesOnAddress(audio_devices_t device); // find the outputs on a given output descriptor that have the given address. // to be called on an AudioOutputDescriptor whose supported devices (as defined @@ -892,8 +894,6 @@ private: const audio_devices_t device /*in*/, const String8 address /*in*/, SortedVector<audio_io_handle_t>& outputs /*out*/); - uint32_t nextUniqueId(); - uint32_t nextAudioPortGeneration(); uint32_t curAudioPortGeneration() const { return mAudioPortGeneration; } // internal method to return the output handle for the given device and format audio_io_handle_t getOutputForDevice( |