diff options
| author | Leo Wang <leozwang@google.com> | 2015-01-15 06:25:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-15 06:25:42 +0000 |
| commit | 73315c1a8b39dcc7b9c8721de6653405503b3a5b (patch) | |
| tree | eb656b230252afe87467e60c07e165584c35c949 /services | |
| parent | 4a738c9bdb98f2617dae3a082a979d94e35a44da (diff) | |
| parent | c9123e9aec7d84b51e5e3863953bcbd05e754513 (diff) | |
| download | frameworks_av-73315c1a8b39dcc7b9c8721de6653405503b3a5b.zip frameworks_av-73315c1a8b39dcc7b9c8721de6653405503b3a5b.tar.gz frameworks_av-73315c1a8b39dcc7b9c8721de6653405503b3a5b.tar.bz2 | |
am c9123e9a: am eed5e4bd: am 5b578bec: Merge " [FM]There is no sound output from BT earphone while BT earphone is connected" into lmp-mr1-dev
* commit 'c9123e9aec7d84b51e5e3863953bcbd05e754513':
[FM]There is no sound output from BT earphone while BT earphone is connected
Diffstat (limited to 'services')
| -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( |