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

Merge "CSD: Fix possible NPE when no records are stored"

Browse Source
This commit is contained in:
TreeHugger Robot
2023-02-07 17:37:02 +00:00
committed by Android (Google) Code Review
parent ffe3dd2f8a ccb52608ad
commit 85799cdbc3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -595,9 +595,12 @@ public class SoundDoseHelper {
Settings.Global.AUDIO_SAFE_CSD_CURRENT_VALUE, /* defaultValue= */0.f);
mNextCsdWarning = parseGlobalSettingFloat(
Settings.Global.AUDIO_SAFE_CSD_NEXT_WARNING, /* defaultValue= */1.f);
mDoseRecords.addAll(persistedStringToRecordList(
final List<SoundDoseRecord> records = persistedStringToRecordList(
mSettings.getGlobalString(mAudioService.getContentResolver(),
Settings.Global.AUDIO_SAFE_CSD_DOSE_RECORDS)));
Settings.Global.AUDIO_SAFE_CSD_DOSE_RECORDS));
if (records != null) {
mDoseRecords.addAll(records);
}
}
reset();