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

2023-03-13 16:49:28 +00:00
parent 628ef8cc2d e2fcd66f5f
commit e7afcdd220
1 changed files with 2 additions and 4 deletions
--- 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) {