diff options
| author | Eric Laurent <elaurent@google.com> | 2014-07-27 17:41:46 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2014-07-27 17:42:22 -0700 |
| commit | d0081ece36dcb6ecdadeb9fc0ee912cffb7effc7 (patch) | |
| tree | 4626fa62e5205d13b22c7eaf7d57af202677d4a4 /src | |
| parent | d03d766459462a0f86a800ac4cc0cecb05e97beb (diff) | |
| download | android_frameworks_wilhelm-d0081ece36dcb6ecdadeb9fc0ee912cffb7effc7.tar.gz android_frameworks_wilhelm-d0081ece36dcb6ecdadeb9fc0ee912cffb7effc7.tar.bz2 android_frameworks_wilhelm-d0081ece36dcb6ecdadeb9fc0ee912cffb7effc7.zip | |
rename AudioSystem::newAudioSessionId()
Rename AudioSystem::newAudioSessionId() to
AudioSystem::newAudioUniqueId() as it can be used
also for I/O handles.
Bug: 12378680.
Change-Id: I5f0eaaadc21ff2aacf81670490ad42c54537d86b
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/AudioPlayer_to_android.cpp | 2 | ||||
| -rw-r--r-- | src/android/MediaPlayer_to_android.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp index 7275dee..696e60d 100644 --- a/src/android/AudioPlayer_to_android.cpp +++ b/src/android/AudioPlayer_to_android.cpp @@ -1324,7 +1324,7 @@ void android_audioPlayer_create(CAudioPlayer *pAudioPlayer) { // FIXME Consolidate initializations (many of these already in IEngine_CreateAudioPlayer) // mAndroidObjType: see above comment pAudioPlayer->mAndroidObjState = ANDROID_UNINITIALIZED; - pAudioPlayer->mSessionId = android::AudioSystem::newAudioSessionId(); + pAudioPlayer->mSessionId = android::AudioSystem::newAudioUniqueId(); // placeholder: not necessary yet as session ID lifetime doesn't extend beyond player // android::AudioSystem::acquireAudioSessionId(pAudioPlayer->mSessionId); diff --git a/src/android/MediaPlayer_to_android.cpp b/src/android/MediaPlayer_to_android.cpp index 69eb0aa..3622356 100644 --- a/src/android/MediaPlayer_to_android.cpp +++ b/src/android/MediaPlayer_to_android.cpp @@ -393,7 +393,7 @@ XAresult android_Player_create(CMediaPlayer *mp) { // FIXME duplicates an initialization also done by higher level mp->mAndroidObjState = ANDROID_UNINITIALIZED; mp->mStreamType = ANDROID_DEFAULT_OUTPUT_STREAM_TYPE; - mp->mSessionId = android::AudioSystem::newAudioSessionId(); + mp->mSessionId = android::AudioSystem::newAudioUniqueId(); // placeholder: not necessary yet as session ID lifetime doesn't extend beyond player // android::AudioSystem::acquireAudioSessionId(mp->mSessionId); |