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

Commit bf09bb30 authored by Haofan Wang's avatar Haofan Wang
Browse files

Modify the way to process vendor picture parameters 

The vendor picture parameter will be in the same bundle as the
pre-defined parameters instead of a vendor bundle. Exclude the
pre-defined parameter during convert persistable bundle to picture
parameter process. So the rest left in the bundle will be the vendor
parameters.

Bug: 393450022
Flag: android.media.tv.flags.media_quality_fw_bugfix
Test: atest CtsMediaQualityTestCases
Change-Id: Ieead427a3e4b293c19843d17233dc56a13ef0a34
parent 383cebaf

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

+3 −9
Original line number Diff line number Diff line
@@ -371,12 +371,8 @@ public class MediaQualityService extends SystemService { 
                    PictureParameter[] pictureParameters = MediaQualityUtils

                            .convertPersistableBundleToPictureParameterList(params);



                    PersistableBundle vendorPictureParameters = params

                            .getPersistableBundle(BaseParameters.VENDOR_PARAMETERS);

                    Parcel parcel = Parcel.obtain();

                    if (vendorPictureParameters != null) {

                        setVendorPictureParameters(pp, parcel, vendorPictureParameters);

                    }

                    setVendorPictureParameters(pp, parcel, params);



                    pp.pictureParameters = pictureParameters;
@@ -1429,11 +1425,9 @@ public class MediaQualityService extends SystemService { 
                    MediaQualityUtils.convertPersistableBundleToPictureParameterList(

                            params);



            PersistableBundle vendorPictureParameters = params

                    .getPersistableBundle(BaseParameters.VENDOR_PARAMETERS);

            Parcel parcel = Parcel.obtain();

            if (vendorPictureParameters != null) {

                setVendorPictureParameters(pictureParameters, parcel, vendorPictureParameters);

            if (params != null) {

                setVendorPictureParameters(pictureParameters, parcel, params);

            }



            android.hardware.tv.mediaquality.PictureProfile toReturn =

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

+80 −0

File changed.

Preview size limit exceeded, changes collapsed.