diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-10-07 09:27:06 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2013-10-07 09:31:15 -0700 |
| commit | 35295078ab59c8c5d143a54d5a55557c3ca62c51 (patch) | |
| tree | ebe936c19f0de4024fa1982fcd286a803bc3b951 /include | |
| parent | 61f58c0c8d02970ea6d94ff816c54bf606f755b7 (diff) | |
| parent | 9a7d11f07dc19327892915f0bfecce758d2f4098 (diff) | |
| download | frameworks_av-35295078ab59c8c5d143a54d5a55557c3ca62c51.zip frameworks_av-35295078ab59c8c5d143a54d5a55557c3ca62c51.tar.gz frameworks_av-35295078ab59c8c5d143a54d5a55557c3ca62c51.tar.bz2 | |
resolved conflicts for merge of 9a7d11f0 to master
Change-Id: Ie4d101185a93d37ec280f608813ad62a077a584e
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IAudioFlinger.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 49f921b..eaf7780 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -53,6 +53,9 @@ public: }; typedef uint32_t track_flags_t; + // invariant on exit for all APIs that return an sp<>: + // (return value != 0) == (*status == NO_ERROR) + /* create an audio track and registers it with AudioFlinger. * return null if the track cannot be created. */ |