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

Commit 25635ba6 authored by Preethi Kandhalu's avatar Preethi Kandhalu
Browse files

[Media Quality] Support for includeParams 

Test: m
Fix: 383364879
Flag: android.media.tv.flags.media_quality_fw

Change-Id: Ie7e27d356d72258ae60319911fc813daecfbacc0
parent 9c3cfbc9

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

+15 −11
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import org.json.JSONException; 
import org.json.JSONObject;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Iterator;

import java.util.List;

import java.util.Locale;
@@ -141,7 +142,7 @@ public class MediaQualityService extends SystemService { 
            try (

                    Cursor cursor = getCursorAfterQuerying(

                            mMediaQualityDbHelper.PICTURE_QUALITY_TABLE_NAME,

                            getAllMediaProfileColumns(), selection, selectionArguments)

                            getMediaProfileColumns(includeParams), selection, selectionArguments)

            ) {

                int count = cursor.getCount();

                if (count == 0) {
@@ -163,8 +164,8 @@ public class MediaQualityService extends SystemService { 
                String packageName, boolean includeParams, UserHandle user) {

            String selection = BaseParameters.PARAMETER_PACKAGE + " = ?";

            String[] selectionArguments = {packageName};

            return getPictureProfilesBasedOnConditions(getAllMediaProfileColumns(), selection,

                    selectionArguments);

            return getPictureProfilesBasedOnConditions(getMediaProfileColumns(includeParams),

                    selection, selectionArguments);

        }



        @Override
@@ -262,7 +263,7 @@ public class MediaQualityService extends SystemService { 
            try (

                    Cursor cursor = getCursorAfterQuerying(

                            mMediaQualityDbHelper.SOUND_QUALITY_TABLE_NAME,

                            getAllMediaProfileColumns(), selection, selectionArguments)

                            getMediaProfileColumns(includeParams), selection, selectionArguments)

            ) {

                int count = cursor.getCount();

                if (count == 0) {
@@ -284,8 +285,8 @@ public class MediaQualityService extends SystemService { 
                String packageName, boolean includeParams, UserHandle user) {

            String selection = BaseParameters.PARAMETER_PACKAGE + " = ?";

            String[] selectionArguments = {packageName};

            return getSoundProfilesBasedOnConditions(getAllMediaProfileColumns(), selection,

                    selectionArguments);

            return getSoundProfilesBasedOnConditions(getMediaProfileColumns(includeParams),

                    selection, selectionArguments);

        }



        @Override
@@ -409,15 +410,18 @@ public class MediaQualityService extends SystemService { 
            return values;

        }



        private String[] getAllMediaProfileColumns() {

            return new String[]{

        private String[] getMediaProfileColumns(boolean includeParams) {

            ArrayList<String> columns = new ArrayList<>(Arrays.asList(

                    BaseParameters.PARAMETER_ID,

                    BaseParameters.PARAMETER_TYPE,

                    BaseParameters.PARAMETER_NAME,

                    BaseParameters.PARAMETER_INPUT_ID,

                    BaseParameters.PARAMETER_PACKAGE,

                    mMediaQualityDbHelper.SETTINGS

            };

                    BaseParameters.PARAMETER_PACKAGE)

            );

            if (includeParams) {

                columns.add(mMediaQualityDbHelper.SETTINGS);

            }

            return columns.toArray(new String[0]);

        }



        private PictureProfile getPictureProfileWithTempIdFromCursor(Cursor cursor) {