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

Commit 8a716925 authored by Vlad Popa's avatar Vlad Popa Committed by Automerger Merge Worker
Browse files

Merge "CSD: Remove forced logic" into udc-dev am: e7afcdd2 am: 63820810 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21985982



Change-Id: I5b0e99e245226e3ad1b67e768ac0b99f35fe83ae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d60e13d 63820810

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

+2 −4
Original line number Diff line number Diff line
@@ -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);

        }



        long time = 0;

        if (forced) {