From e2fcd66f5fef26c65e4b5059482a0b94bcebdd14 Mon Sep 17 00:00:00 2001
From: Vlad Popa <pvlad@google.com>
Date: Mon, 13 Mar 2023 11:38:49 +0100
Subject: [PATCH] CSD: Remove forced logic

This logic causes the audio handler to not remove the callbacks if the
forced flag was not set.

Test: manual log, dumpsys and atest SoundDoseHelperTest
Bug: 271311101
Bug: 271201291
Change-Id: I7467952bcaeaddaabf71e241c2ea387216ef4c18
---
 .../core/java/com/android/server/audio/SoundDoseHelper.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/audio/SoundDoseHelper.java b/services/core/java/com/android/server/audio/SoundDoseHelper.java
index 6a97243282a6a..3dac04cc1426a 100644
--- a/services/core/java/com/android/server/audio/SoundDoseHelper.java
+++ b/services/core/java/com/android/server/audio/SoundDoseHelper.java
@@ -574,10 +574,8 @@ public class SoundDoseHelper {
 
     /*package*/ void configureSafeMedia(boolean forced, String caller) {
         int msg = MSG_CONFIGURE_SAFE_MEDIA;
-        if (forced) {
-            // unforced should not cancel forced configure messages
-            mAudioHandler.removeMessages(msg);
-        }
+
+        mAudioHandler.removeMessages(msg);
 
         long time = 0;
         if (forced) {