diff options
| author | Steven Laver <lavers@google.com> | 2020-02-04 22:57:22 -0800 |
|---|---|---|
| committer | Steven Laver <lavers@google.com> | 2020-02-06 14:27:42 -0800 |
| commit | 89ec9480cf4430b6728b16396a408c1aa26f19a9 (patch) | |
| tree | f9a888e63588b25c457d8871f6fbb6b673044f1a /audio/core/all-versions/default/PrimaryDevice.cpp | |
| parent | 4e64db5a184f0734778df5e1c12d32f702220b35 (diff) | |
| parent | 146a5a28331209aa145c0af2f883b7e023ce4800 (diff) | |
Merge RP1A.200204.001
Change-Id: Icdc452e8cf70e432759c112a5b5b12b61e40f0bc
Diffstat (limited to 'audio/core/all-versions/default/PrimaryDevice.cpp')
| -rw-r--r-- | audio/core/all-versions/default/PrimaryDevice.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/audio/core/all-versions/default/PrimaryDevice.cpp b/audio/core/all-versions/default/PrimaryDevice.cpp index 679f85dad3..11c1c5a4df 100644 --- a/audio/core/all-versions/default/PrimaryDevice.cpp +++ b/audio/core/all-versions/default/PrimaryDevice.cpp @@ -203,6 +203,9 @@ Return<Result> PrimaryDevice::setMode(AudioMode mode) { case AudioMode::RINGTONE: case AudioMode::IN_CALL: case AudioMode::IN_COMMUNICATION: +#if MAJOR_VERSION >= 6 + case AudioMode::CALL_SCREEN: +#endif break; // Valid values default: return Result::INVALID_ARGUMENTS; |