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

Commit 85799cdb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents ffe3dd2f ccb52608
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -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();