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

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

Merge "Add null checker for tvinput id in onStreamStatus" into main

parents fe0568b4 a2da6cbc

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

+30 −18
Original line number Original line Diff line number Diff line
@@ -2143,19 +2143,25 @@ public class MediaQualityService extends SystemService { 
                        Slog.d(TAG, "The new status is " + newStatus);

                        Slog.d(TAG, "The new status is " + newStatus);

                        String selection = BaseParameters.PARAMETER_TYPE + " = ? AND "

                        String selection = BaseParameters.PARAMETER_TYPE + " = ? AND "

                                + BaseParameters.PARAMETER_PACKAGE + " = ? AND "

                                + BaseParameters.PARAMETER_PACKAGE + " = ? AND "

                                + BaseParameters.PARAMETER_INPUT_ID + " = ? AND "

                                + BaseParameters.PARAMETER_NAME + " = ?";

                                + BaseParameters.PARAMETER_NAME + " = ?";

                        String[] selectionArguments = {

                        List<String> selectionArguments = new ArrayList<>();

                                Integer.toString(previous.getProfileType()),

                        selectionArguments.add(Integer.toString(previous.getProfileType()));

                                previous.getPackageName(),

                        selectionArguments.add(previous.getPackageName());

                                previous.getInputId(),

                        selectionArguments.add(profileName + "/" + newStatus);

                                profileName + "/" + newStatus

                        if (previous.getInputId() != null) {

                        };

                            Log.d(TAG, "onStreamStatusChanged: "

                                    + "The input is not null for previous picture profile");

                            selection += " AND " + BaseParameters.PARAMETER_INPUT_ID + " = ?";

                            selectionArguments.add(previous.getInputId());

                        }

                        Log.d(TAG, "onStreamStatusChanged: "

                                + "The selection is " + selection

                                + " The selection argument is " + selectionArguments);

                        List<PictureProfile> list =

                        List<PictureProfile> list =

                                mMqDatabaseUtils.getPictureProfilesBasedOnConditions(

                                mMqDatabaseUtils.getPictureProfilesBasedOnConditions(

                                        MediaQualityUtils.getMediaProfileColumns(true),

                                        MediaQualityUtils.getMediaProfileColumns(true),

                                        selection,

                                        selection,

                                        selectionArguments);

                                        selectionArguments.toArray(new String[0]));

                        if (list.isEmpty()) {

                        if (list.isEmpty()) {

                            Slog.d(TAG, "The picture profile list is empty");

                            Slog.d(TAG, "The picture profile list is empty");

                            // Short term solution for b/422302653.

                            // Short term solution for b/422302653.
@@ -2583,22 +2589,28 @@ public class MediaQualityService extends SystemService { 




    private PictureProfile getSdrPictureProfile(String profileName, PictureProfile previous) {

    private PictureProfile getSdrPictureProfile(String profileName, PictureProfile previous) {

        String selection = BaseParameters.PARAMETER_TYPE + " = ? AND "

        String selection = BaseParameters.PARAMETER_TYPE + " = ? AND "

                + BaseParameters.PARAMETER_PACKAGE + " = ? AND "

                + BaseParameters.PARAMETER_PACKAGE + " = ? AND ("

                + BaseParameters.PARAMETER_INPUT_ID + " = ? AND ("

                + BaseParameters.PARAMETER_NAME + " = ? OR "

                + BaseParameters.PARAMETER_NAME + " = ? OR "

                + BaseParameters.PARAMETER_NAME + " = ?)";

                + BaseParameters.PARAMETER_NAME + " = ?)";

        String[] selectionArguments = {

        List<String> selectionArguments = new ArrayList<>();

                Integer.toString(previous.getProfileType()),

        selectionArguments.add(Integer.toString(previous.getProfileType()));

                previous.getPackageName(),

        selectionArguments.add(previous.getPackageName());

                previous.getInputId(),

        selectionArguments.add(profileName);

                profileName,

        selectionArguments.add(profileName + "/" + PictureProfile.STATUS_SDR);

                profileName + "/" + PictureProfile.STATUS_SDR

        if (previous.getInputId() != null) {

        };

            Log.d(TAG, "getSdrPictureProfile: "

                    + "The input is not null for previous picture profile");

            selection += " AND " + BaseParameters.PARAMETER_INPUT_ID + " = ?";

            selectionArguments.add(previous.getInputId());

        }

        Log.d(TAG, "getSdrPictureProfile: "

                + "The selection is " + selection

                + " The selection argument is " + selectionArguments);

        List<PictureProfile> list =

        List<PictureProfile> list =

                mMqDatabaseUtils.getPictureProfilesBasedOnConditions(

                mMqDatabaseUtils.getPictureProfilesBasedOnConditions(

                        MediaQualityUtils.getMediaProfileColumns(true),

                        MediaQualityUtils.getMediaProfileColumns(true),

                        selection,

                        selection,

                        selectionArguments);

                        selectionArguments.toArray(new String[0]));

        if (list.isEmpty()) {

        if (list.isEmpty()) {

            return null;

            return null;

        }

        }