diff options
author | Eric Laurent <elaurent@google.com> | 2014-07-27 18:38:22 -0700 |
---|---|---|
committer | Eric Laurent <elaurent@google.com> | 2014-07-28 21:43:16 +0000 |
commit | de3f8392fbf380ba6f09d009b00d7172477389a2 (patch) | |
tree | 77687cb28cf7dfb34ebb6317e246b3cad5672b86 /services | |
parent | 03524dcc1215b2c468f5c8c8abe6f1c26239fd71 (diff) | |
download | frameworks_av-de3f8392fbf380ba6f09d009b00d7172477389a2.zip frameworks_av-de3f8392fbf380ba6f09d009b00d7172477389a2.tar.gz frameworks_av-de3f8392fbf380ba6f09d009b00d7172477389a2.tar.bz2 |
rename AudioSystem::newAudioSessionId()
Rename AudioSystem::newAudioSessionId() to
AudioSystem::newAudioUniqueId() as it can be used
also for I/O handles.
Bug: 12378680.
Change-Id: I611ea3b5eb57a4b0774437f477ee87dc4ccc2cc2
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 2 | ||||
-rw-r--r-- | services/audioflinger/AudioFlinger.h | 2 | ||||
-rw-r--r-- | services/audiopolicy/AudioPolicyClientImpl.cpp | 5 | ||||
-rw-r--r-- | services/audiopolicy/AudioPolicyInterface.h | 2 | ||||
-rw-r--r-- | services/audiopolicy/AudioPolicyService.h | 2 |
5 files changed, 11 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index b2f46f5..bd7121e 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -2037,7 +2037,7 @@ status_t AudioFlinger::invalidateStream(audio_stream_type_t stream) } -int AudioFlinger::newAudioSessionId() +audio_unique_id_t AudioFlinger::newAudioUniqueId() { return nextUniqueId(); } diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 754273d..731d3da 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -194,7 +194,7 @@ public: virtual uint32_t getInputFramesLost(audio_io_handle_t ioHandle) const; - virtual int newAudioSessionId(); + virtual audio_unique_id_t newAudioUniqueId(); virtual void acquireAudioSessionId(int audioSession, pid_t pid); diff --git a/services/audiopolicy/AudioPolicyClientImpl.cpp b/services/audiopolicy/AudioPolicyClientImpl.cpp index aa309d1..c0019d1 100644 --- a/services/audiopolicy/AudioPolicyClientImpl.cpp +++ b/services/audiopolicy/AudioPolicyClientImpl.cpp @@ -212,4 +212,9 @@ void AudioPolicyService::AudioPolicyClient::onAudioPatchListUpdate() mAudioPolicyService->onAudioPatchListUpdate(); } +audio_unique_id_t AudioPolicyService::AudioPolicyClient::newAudioUniqueId() +{ + return AudioSystem::newAudioUniqueId(); +} + }; // namespace android diff --git a/services/audiopolicy/AudioPolicyInterface.h b/services/audiopolicy/AudioPolicyInterface.h index 0e53afc..749350a 100644 --- a/services/audiopolicy/AudioPolicyInterface.h +++ b/services/audiopolicy/AudioPolicyInterface.h @@ -287,6 +287,8 @@ public: virtual void onAudioPortListUpdate() = 0; virtual void onAudioPatchListUpdate() = 0; + + virtual audio_unique_id_t newAudioUniqueId() = 0; }; extern "C" AudioPolicyInterface* createAudioPolicyManager(AudioPolicyClientInterface *clientInterface); diff --git a/services/audiopolicy/AudioPolicyService.h b/services/audiopolicy/AudioPolicyService.h index 63fc0c3..3769aab 100644 --- a/services/audiopolicy/AudioPolicyService.h +++ b/services/audiopolicy/AudioPolicyService.h @@ -437,6 +437,8 @@ private: virtual void onAudioPortListUpdate(); virtual void onAudioPatchListUpdate(); + virtual audio_unique_id_t newAudioUniqueId(); + private: AudioPolicyService *mAudioPolicyService; }; |