Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8330bd51 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

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

* commit 'b0eb08b5':
  Remove the 5 sec timeout logic for setVolumeControlStream
parents d78cdb1d b0eb08b5

services/core/java/com/android/server/audio/AudioService.java

+1 −1
Original line number Diff line number Diff line
@@ -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;