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

Browse Source
This commit is contained in:
Vlad Popa
2023-05-10 12:53:41 +00:00
committed by Android (Google) Code Review
parent 6a1a88246a 750ecb9b43
commit 31ee265e84
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(); 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. // 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 // 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. // automatically. mMusicActiveMs is rounded to a multiple of MUSIC_ACTIVE_POLL_PERIOD_MS.
@@ -430,12 +427,6 @@ public class SoundDoseHelper {
return; return;
} }
synchronized (mSafeMediaVolumeStateLock) {
mSafeMediaVolumeState = SAFE_MEDIA_VOLUME_ACTIVE;
mMusicActiveMs = 0;
saveMusicActiveMs();
}
synchronized (mCsdStateLock) { synchronized (mCsdStateLock) {
mLastMomentaryExposureTimeMs = MOMENTARY_EXPOSURE_TIMEOUT_UNINITIALIZED; mLastMomentaryExposureTimeMs = MOMENTARY_EXPOSURE_TIMEOUT_UNINITIALIZED;
} }
@@ -475,8 +466,6 @@ public class SoundDoseHelper {
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Exception while forcing CSD computation on all devices", e); Log.e(TAG, "Exception while forcing CSD computation on all devices", e);
} }
mForceSafeMediaOnAllDevices = computeCsdOnAllDevices;
} }
boolean isCsdEnabled() { boolean isCsdEnabled() {
@@ -559,7 +548,7 @@ public class SoundDoseHelper {
private boolean checkSafeMediaVolume_l(int streamType, int index, int device) { private boolean checkSafeMediaVolume_l(int streamType, int index, int device) {
return (mSafeMediaVolumeState == SAFE_MEDIA_VOLUME_ACTIVE) return (mSafeMediaVolumeState == SAFE_MEDIA_VOLUME_ACTIVE)
&& (AudioService.mStreamVolumeAlias[streamType] == AudioSystem.STREAM_MUSIC) && (AudioService.mStreamVolumeAlias[streamType] == AudioSystem.STREAM_MUSIC)
&& (safeDevicesContains(device) || mForceSafeMediaOnAllDevices) && safeDevicesContains(device)
&& (index > safeMediaVolumeIndex(device)); && (index > safeMediaVolumeIndex(device));
} }