summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hyundo Moon <hdmoon@google.com> 2022-08-03 10:42:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-03 10:42:30 +0000
commit28852510129a7fad8b3d48442957b9ff2cb545b6 (patch)
tree809931f70f151a08ba1cd51c95168cc875c72c63
parent52a8783b375f7425dbccb9d7fc56896c2384d4a6 (diff)
parent49af33aef901c639dc31cb2ce3b8f0265fa71d2f (diff)
Add more modes for volume updates am: 6642aecb28 am: f415cd4e13 am: 49af33aef9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19514729 Change-Id: I5d7a1a5142807d1ae708ca729443de92f599cb39 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java20
1 files changed, 8 insertions, 12 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index f0a7df40d590..298ee97d070c 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -3942,14 +3942,12 @@ public class AudioService extends IAudioService.Stub
case AudioSystem.MODE_IN_COMMUNICATION:
case AudioSystem.MODE_IN_CALL:
case AudioSystem.MODE_NORMAL:
+ case AudioSystem.MODE_CALL_SCREENING:
+ case AudioSystem.MODE_CALL_REDIRECT:
+ case AudioSystem.MODE_COMMUNICATION_REDIRECT:
break;
- case AudioSystem.MODE_RINGTONE:
- // not changing anything for ringtone
- return;
- case AudioSystem.MODE_CURRENT:
- case AudioSystem.MODE_INVALID:
default:
- // don't know what to do in this case, better bail
+ // no-op is enough for all other values
return;
}
@@ -3977,14 +3975,12 @@ public class AudioService extends IAudioService.Stub
case AudioSystem.MODE_IN_COMMUNICATION:
case AudioSystem.MODE_IN_CALL:
case AudioSystem.MODE_NORMAL:
+ case AudioSystem.MODE_CALL_SCREENING:
+ case AudioSystem.MODE_CALL_REDIRECT:
+ case AudioSystem.MODE_COMMUNICATION_REDIRECT:
break;
- case AudioSystem.MODE_RINGTONE:
- // not changing anything for ringtone
- return;
- case AudioSystem.MODE_CURRENT:
- case AudioSystem.MODE_INVALID:
default:
- // don't know what to do in this case, better bail
+ // no-op is enough for all other values
return;
}