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

Merge "CSD: clean up sound dose test API" into udc-dev am: 31ee265e84

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

Change-Id: Ifdb9a0ddfda61d883e08c98708b90b1adc6b16ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vlad Popa
2023-05-10 13:22:49 +00:00
committed by Automerger Merge Worker
parent a5c233bd4c 31ee265e84
commit 1e8854edfe
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/audio/SoundDoseHelper.java
View File

@@ -174,9 +174,6 @@ public class SoundDoseHelper {
*/
private final SparseIntArray mSafeMediaVolumeDevices = new SparseIntArray();
/** Used for testing to enforce safe media on all devices */
private boolean mForceSafeMediaOnAllDevices = false;
// mMusicActiveMs is the cumulative time of music activity since safe volume was disabled.
// When this time reaches UNSAFE_VOLUME_MUSIC_ACTIVE_MS_MAX, the safe media volume is re-enabled
// automatically. mMusicActiveMs is rounded to a multiple of MUSIC_ACTIVE_POLL_PERIOD_MS.
@@ -430,12 +427,6 @@ public class SoundDoseHelper {
return;
}
synchronized (mSafeMediaVolumeStateLock) {
mSafeMediaVolumeState = SAFE_MEDIA_VOLUME_ACTIVE;
mMusicActiveMs = 0;
saveMusicActiveMs();
}
synchronized (mCsdStateLock) {
mLastMomentaryExposureTimeMs = MOMENTARY_EXPOSURE_TIMEOUT_UNINITIALIZED;
}
@@ -475,8 +466,6 @@ public class SoundDoseHelper {
} catch (RemoteException e) {
Log.e(TAG, "Exception while forcing CSD computation on all devices", e);
}
mForceSafeMediaOnAllDevices = computeCsdOnAllDevices;
}
boolean isCsdEnabled() {
@@ -559,7 +548,7 @@ public class SoundDoseHelper {
private boolean checkSafeMediaVolume_l(int streamType, int index, int device) {
return (mSafeMediaVolumeState == SAFE_MEDIA_VOLUME_ACTIVE)
&& (AudioService.mStreamVolumeAlias[streamType] == AudioSystem.STREAM_MUSIC)
&& (safeDevicesContains(device) || mForceSafeMediaOnAllDevices)
&& safeDevicesContains(device)
&& (index > safeMediaVolumeIndex(device));
}