Merge "Modify the way to process vendor picture parameters" into main (1a3eeb5c) · Commits · e / os / android_frameworks_base

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 =

+80 −0

File changed.

Preview size limit exceeded, changes collapsed.