diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-03 13:02:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 13:02:36 +0000 |
| commit | 011384898c18c6b1119716aa6967e52b33c676a7 (patch) | |
| tree | d5ef5f1d516d12301b0a65b5dbfea16938588270 /cras/README.dbus-api | |
| parent | 4925d2131a41eb9ae6805c664ec7685b741072b1 (diff) | |
| parent | 584e788b97cebfb0ede51b7d603b9e03e6142c18 (diff) | |
| download | adhd-011384898c18c6b1119716aa6967e52b33c676a7.tar.gz | |
Merge "Revert^2 "Merge branch 'upstream-master'"" am: 0aaab56eba am: 1a33fa0434 am: 6552c7ad82 am: 584e788b97
Original change: https://android-review.googlesource.com/c/platform/external/adhd/+/1613721
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6c1f660f552a8c08ece8120abd5da68618958fd8
Diffstat (limited to 'cras/README.dbus-api')
| -rw-r--r-- | cras/README.dbus-api | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cras/README.dbus-api b/cras/README.dbus-api index 243107a0..c55a8df6 100644 --- a/cras/README.dbus-api +++ b/cras/README.dbus-api @@ -151,9 +151,9 @@ Methods void SetOutputVolume(int32 volume) int32 IsAudioOutputActive() Returns 1 if there are currently any active output streams, - excluding 'dummy' streams that are not actually outputting any + excluding 'fake' streams that are not actually outputting any audio. Returns 0 if there are no active streams, or all active - streams are 'dummy' streams. + streams are 'fake' streams. void SetGlobalOutputChannelRemix(int32 num_channels, array:double coefficient) |