commit e7afcdd22082cb32e29882a4aff1337b436f496d
author Vlad Popa <pvlad@google.com> Mon Mar 13 16:49:28 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 13 16:49:28 2023 +0000
tree 1fc56e632c28661c9ffe9dd9732ac553666de95f
parent 628ef8cc2db22515bbe72ea8eda46f063e460d90
parent e2fcd66f5fef26c65e4b5059482a0b94bcebdd14

Merge "CSD: Remove forced logic" into udc-dev

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 6a97243..3dac04c 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 @@
 
     /*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) {