commit 85799cdbc3bcc1692f65583da567a72c80393c48
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 07 17:37:02 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 07 17:37:02 2023 +0000
tree 3077c72681ebd15b063b051e8643c6752384f693
parent ffe3dd2f8a9275cbb6acaf5a666fd9f4671cd95f
parent ccb52608ad91f89f3df4fd31c7494d0e08a35c40

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

services/core/java/com/android/server/audio/SoundDoseHelper.java

diff --git a/services/core/java/com/android/server/audio/SoundDoseHelper.java b/services/core/java/com/android/server/audio/SoundDoseHelper.java
index ac02eb7..748c4ce5 100644
--- a/services/core/java/com/android/server/audio/SoundDoseHelper.java
+++ b/services/core/java/com/android/server/audio/SoundDoseHelper.java
@@ -595,9 +595,12 @@
                         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();