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

Commit d87ac8d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[MQ] Bug fix" into main

parents f9a50ff6 d16958c1

services/core/java/com/android/server/media/quality/MediaQualityService.java

+2 −0
Original line number Diff line number Diff line
@@ -2108,6 +2108,7 @@ public class MediaQualityService extends SystemService { 
                        // flag to indicate that there is a onStreamStatusChange.

                        currentProfileParameters.putString(PREVIOUS_STREAM_STATUS, profileStatus);

                        mHandleToPictureProfile.put(profileHandle, current);

                        mCurrentPictureHandleToOriginal.removeValue(profileHandle);

                        mCurrentPictureHandleToOriginal.put(

                                current.getHandle().getId(), profileHandle);

                        mMqManagerNotifier.notifyOnPictureProfileUpdated(
@@ -2153,6 +2154,7 @@ public class MediaQualityService extends SystemService { 
                        // flag to indicate that there is a onStreamStatusChange.

                        currentProfileParameters.putString(PREVIOUS_STREAM_STATUS, profileStatus);

                        mHandleToPictureProfile.put(profileHandle, current);

                        mCurrentPictureHandleToOriginal.removeValue(profileHandle);

                        mCurrentPictureHandleToOriginal.put(

                                current.getHandle().getId(), profileHandle);

                        mMqManagerNotifier.notifyOnPictureProfileUpdated(

services/core/java/com/android/server/media/quality/MediaQualityUtils.java

+9 −6
Original line number Diff line number Diff line
@@ -1409,27 +1409,30 @@ public final class MediaQualityUtils { 
        }



        if (params.containsKey(SoundQuality.PARAMETER_DTS_VIRTUAL_X_LIMITER)) {

            dts.tbHdx = params.getBoolean(SoundQuality.PARAMETER_DTS_VIRTUAL_X_LIMITER);

            dts.limiter = params.getBoolean(SoundQuality.PARAMETER_DTS_VIRTUAL_X_LIMITER);

            params.remove(SoundQuality.PARAMETER_DTS_VIRTUAL_X_LIMITER);

        }

        if (params.containsKey(SoundQuality.PARAMETER_DTS_VIRTUAL_X_TRU_SURROUND_X)) {

            dts.tbHdx = params.getBoolean(SoundQuality.PARAMETER_DTS_VIRTUAL_X_TRU_SURROUND_X);

            dts.truSurroundX = params.getBoolean(

                    SoundQuality.PARAMETER_DTS_VIRTUAL_X_TRU_SURROUND_X);

            params.remove(SoundQuality.PARAMETER_DTS_VIRTUAL_X_TRU_SURROUND_X);

        }

        if (params.containsKey(SoundQuality.PARAMETER_DTS_VIRTUAL_X_TRU_VOLUME_HD)) {

            dts.tbHdx = params.getBoolean(SoundQuality.PARAMETER_DTS_VIRTUAL_X_TRU_VOLUME_HD);

            dts.truVolumeHd = params.getBoolean(

                    SoundQuality.PARAMETER_DTS_VIRTUAL_X_TRU_VOLUME_HD);

            params.remove(SoundQuality.PARAMETER_DTS_VIRTUAL_X_TRU_VOLUME_HD);

        }

        if (params.containsKey(SoundQuality.PARAMETER_DTS_VIRTUAL_X_DIALOG_CLARITY)) {

            dts.tbHdx = params.getBoolean(SoundQuality.PARAMETER_DTS_VIRTUAL_X_DIALOG_CLARITY);

            dts.dialogClarity = params.getBoolean(

                    SoundQuality.PARAMETER_DTS_VIRTUAL_X_DIALOG_CLARITY);

            params.remove(SoundQuality.PARAMETER_DTS_VIRTUAL_X_DIALOG_CLARITY);

        }

        if (params.containsKey(SoundQuality.PARAMETER_DTS_VIRTUAL_X_DEFINITION)) {

            dts.tbHdx = params.getBoolean(SoundQuality.PARAMETER_DTS_VIRTUAL_X_DEFINITION);

            dts.definition = params.getBoolean(SoundQuality.PARAMETER_DTS_VIRTUAL_X_DEFINITION);

            params.remove(SoundQuality.PARAMETER_DTS_VIRTUAL_X_DEFINITION);

        }

        if (params.containsKey(SoundQuality.PARAMETER_DTS_VIRTUAL_X_HEIGHT)) {

            dts.tbHdx = params.getBoolean(SoundQuality.PARAMETER_DTS_VIRTUAL_X_HEIGHT);

            dts.height = params.getBoolean(SoundQuality.PARAMETER_DTS_VIRTUAL_X_HEIGHT);

            params.remove(SoundQuality.PARAMETER_DTS_VIRTUAL_X_HEIGHT);

        }

        soundParams.add(SoundParameter.dtsVirtualX(dts));