diff options
| author | 2015-05-22 15:51:34 +0000 | |
|---|---|---|
| committer | 2015-05-22 15:51:35 +0000 | |
| commit | b0eb08b521d2b76531df3946cece002ed72fa363 (patch) | |
| tree | 53b43d8370a79636454f084ec9596124d0cf6926 | |
| parent | bf3d1af3d8bd32f410aa5cc44ccdc1df593ef210 (diff) | |
| parent | ccffda8359aaf11a6945650dfa39a8cd13604ed2 (diff) | |
Merge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 2 |
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; |