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

Commit 5e7759ba authored by Vlad Popa's avatar Vlad Popa
Browse files

CSD: Fix initial logic for mSafeMediaVolumeState 

When refactoring the safe hearing logic into the SoundDoseHelper we
simplified the msg enum logic for configuring the safe hearing state.
This lead to an issue allowing the forced init messages to be removed by
the config changed message.

Reintroduced the different messages for state configuration which should
fix the issue of having devices with MCC 0 not configured for safe
hearing.

Test: check state in dumpsys
Bug: 278822191
Change-Id: I515ca3e5dec3f0d1facf752e6f82886b9760bb04
parent 6856c694

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

+10 −8
Original line number Diff line number Diff line
@@ -87,10 +87,11 @@ public class SoundDoseHelper { 
    private static final int SAFE_MEDIA_VOLUME_ACTIVE = 3;  // unconfirmed



    private static final int MSG_CONFIGURE_SAFE_MEDIA = SAFE_MEDIA_VOLUME_MSG_START + 1;

    private static final int MSG_PERSIST_SAFE_VOLUME_STATE = SAFE_MEDIA_VOLUME_MSG_START + 2;

    private static final int MSG_PERSIST_MUSIC_ACTIVE_MS = SAFE_MEDIA_VOLUME_MSG_START + 3;

    private static final int MSG_PERSIST_CSD_VALUES = SAFE_MEDIA_VOLUME_MSG_START + 4;

    /*package*/ static final int MSG_CSD_UPDATE_ATTENUATION = SAFE_MEDIA_VOLUME_MSG_START + 5;

    private static final int MSG_CONFIGURE_SAFE_MEDIA_FORCED = SAFE_MEDIA_VOLUME_MSG_START + 2;

    private static final int MSG_PERSIST_SAFE_VOLUME_STATE = SAFE_MEDIA_VOLUME_MSG_START + 3;

    private static final int MSG_PERSIST_MUSIC_ACTIVE_MS = SAFE_MEDIA_VOLUME_MSG_START + 4;

    private static final int MSG_PERSIST_CSD_VALUES = SAFE_MEDIA_VOLUME_MSG_START + 5;

    /*package*/ static final int MSG_CSD_UPDATE_ATTENUATION = SAFE_MEDIA_VOLUME_MSG_START + 6;



    private static final int UNSAFE_VOLUME_MUSIC_ACTIVE_MS_MAX = (20 * 3600 * 1000); // 20 hours
@@ -611,8 +612,7 @@ public class SoundDoseHelper { 
    }



    /*package*/ void configureSafeMedia(boolean forced, String caller) {

        int msg = MSG_CONFIGURE_SAFE_MEDIA;



        int msg = forced ? MSG_CONFIGURE_SAFE_MEDIA_FORCED : MSG_CONFIGURE_SAFE_MEDIA;

        mAudioHandler.removeMessages(msg);



        long time = 0;
@@ -622,7 +622,7 @@ public class SoundDoseHelper { 
        }



        mAudioHandler.sendMessageAtTime(

                mAudioHandler.obtainMessage(msg, /*arg1=*/forced ? 1 : 0, /*arg2=*/0, caller),

                mAudioHandler.obtainMessage(msg, /*arg1=*/0, /*arg2=*/0, caller),

                time);

    }
@@ -664,8 +664,10 @@ public class SoundDoseHelper { 


    /*package*/ void handleMessage(Message msg) {

        switch (msg.what) {

            case MSG_CONFIGURE_SAFE_MEDIA_FORCED:

            case MSG_CONFIGURE_SAFE_MEDIA:

                onConfigureSafeMedia((msg.arg1 == 1), (String) msg.obj);

                onConfigureSafeMedia((msg.what == MSG_CONFIGURE_SAFE_MEDIA_FORCED),

                        (String) msg.obj);

                break;

            case MSG_PERSIST_SAFE_VOLUME_STATE:

                onPersistSafeVolumeState(msg.arg1);