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

Merge "AudioService: increase audio mode timeout." into rvc-qpr-dev am: 33229d78b6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181178

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b3a582a2f8e5c12f4425733e8b7e1af1efa0172
This commit is contained in:
TreeHugger Robot
2020-12-08 21:22:36 +00:00
committed by Automerger Merge Worker
parent d3439c4204 33229d78b6
commit 3a49946a6b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7162,8 +7162,8 @@ public class AudioService extends IAudioService.Stub
private static final int UNSAFE_VOLUME_MUSIC_ACTIVE_MS_MAX = (20 * 3600 * 1000); // 20 hours private static final int UNSAFE_VOLUME_MUSIC_ACTIVE_MS_MAX = (20 * 3600 * 1000); // 20 hours
private static final int MUSIC_ACTIVE_POLL_PERIOD_MS = 60000; // 1 minute polling interval private static final int MUSIC_ACTIVE_POLL_PERIOD_MS = 60000; // 1 minute polling interval
private static final int SAFE_VOLUME_CONFIGURE_TIMEOUT_MS = 30000; // 30s after boot completed private static final int SAFE_VOLUME_CONFIGURE_TIMEOUT_MS = 30000; // 30s after boot completed
// check playback or record activity every 3 seconds for UIDs owning mode IN_COMMUNICATION // check playback or record activity every 6 seconds for UIDs owning mode IN_COMMUNICATION
private static final int CHECK_MODE_FOR_UID_PERIOD_MS = 3000; private static final int CHECK_MODE_FOR_UID_PERIOD_MS = 6000;
private int safeMediaVolumeIndex(int device) { private int safeMediaVolumeIndex(int device) {
if (!mSafeMediaVolumeDevices.contains(device)) { if (!mSafeMediaVolumeDevices.contains(device)) {