summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Michel Trivi <jmtrivi@google.com> 2015-05-21 18:23:57 -0700
committer Jean-Michel Trivi <jmtrivi@google.com> 2015-05-21 18:23:57 -0700
commitccffda8359aaf11a6945650dfa39a8cd13604ed2 (patch)
tree5b643be40b90f694da8854b2aa336cc82f3c2fbc
parent5347d0185ba4e5401e50d9268c68a152c0f05757 (diff)
Remove the 5 sec timeout logic for setVolumeControlStream
Bug 16983918 Change-Id: I65174615d882ea433105862b1ecc50c512979ef9
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 1fd466adc7cc..71351915c643 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -5512,7 +5512,7 @@ public class AudioService extends IAudioService.Stub {
// - STREAM_NOTIFICATION on tablets during this period after a notification stopped
// - STREAM_MUSIC on phones during this period after music or talkback/voice search prompt
// stopped
- private static final int DEFAULT_STREAM_TYPE_OVERRIDE_DELAY_MS = 5000;
+ private static final int DEFAULT_STREAM_TYPE_OVERRIDE_DELAY_MS = 0;
private static final int TOUCH_EXPLORE_STREAM_TYPE_OVERRIDE_DELAY_MS = 1000;
static int sDelayMs;