Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b0eb08b5: Merge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev

Browse Source 
* commit 'b0eb08b521d2b76531df3946cece002ed72fa363':
  Remove the 5 sec timeout logic for setVolumeControlStream
This commit is contained in:
Jean-Michel Trivi
2015-05-22 16:02:57 +00:00
committed by Android Git Automerger
parent d78cdb1d3a b0eb08b521
commit 8330bd519e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -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;