diff options
author | Eric Laurent <elaurent@google.com> | 2015-05-21 16:12:36 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-21 16:12:37 +0000 |
commit | 748a792be85838c429ebf46acf7d6eb02e79f00b (patch) | |
tree | 5f9aa67825176080016baabc4cf844abd1e25ecb /include/media | |
parent | 2232aee25e4df7d04446912e8ad9e9dc44d8ec16 (diff) | |
parent | 72e3f39146fce4686bd96f11057c051bea376dfb (diff) | |
download | frameworks_av-748a792be85838c429ebf46acf7d6eb02e79f00b.zip frameworks_av-748a792be85838c429ebf46acf7d6eb02e79f00b.tar.gz frameworks_av-748a792be85838c429ebf46acf7d6eb02e79f00b.tar.bz2 |
Merge "audio flinger: do not call JAVA services until system is ready" into mnc-dev
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/AudioSystem.h | 3 | ||||
-rw-r--r-- | include/media/IAudioFlinger.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 3241e9c..26cffa6 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -158,6 +158,9 @@ public: // or no HW sync source is used. static audio_hw_sync_t getAudioHwSyncForSession(audio_session_t sessionId); + // Indicate JAVA services are ready (scheduling, power management ...) + static status_t systemReady(); + // Events used to synchronize actions between audio sessions. // For instance SYNC_EVENT_PRESENTATION_COMPLETE can be used to delay recording start until // playback is complete on another audio session. diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 3f7fd09..5051aff 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -243,6 +243,9 @@ public: /* Get the HW synchronization source used for an audio session */ virtual audio_hw_sync_t getAudioHwSyncForSession(audio_session_t sessionId) = 0; + + /* Indicate JAVA services are ready (scheduling, power management ...) */ + virtual status_t systemReady() = 0; }; |