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

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

Merge "[MQ] Reset profile mapping when inactive" into main

parents 841140c9 e95aaf2a

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

+13 −2
Original line number Diff line number Diff line
@@ -2042,9 +2042,20 @@ public class MediaQualityService extends SystemService { 
                throws RemoteException {

            Long dbId = pictureProfile.pictureProfileId;

            if (dbId != null) {

                android.hardware.tv.mediaquality.PictureParameter[] params =

                        pictureProfile.parameters.pictureParameters;

                for (android.hardware.tv.mediaquality.PictureParameter param : params) {

                    if (param.getTag() == PictureParameter.activeProfile

                            && !param.getActiveProfile()) {

                        synchronized (mPictureProfileLock) {

                            mHandleToPictureProfile.remove(dbId);

                            mCurrentPictureHandleToOriginal.removeValue(dbId);

                        }

                        break;

                    }

                }

                updatePictureProfileFromHal(dbId,

                        MediaQualityUtils.convertPictureParameterListToPersistableBundle(

                                pictureProfile.parameters.pictureParameters));

                        MediaQualityUtils.convertPictureParameterListToPersistableBundle(params));

            }

        }