From ccffda8359aaf11a6945650dfa39a8cd13604ed2 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Thu, 21 May 2015 18:23:57 -0700
Subject: [PATCH] Remove the 5 sec timeout logic for setVolumeControlStream

Bug 16983918

Change-Id: I65174615d882ea433105862b1ecc50c512979ef9
---
 services/core/java/com/android/server/audio/AudioService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 1fd466adc7cc4..71351915c6438 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;