Merge "Exclude profiles with tvInputId from the package default" into main (518fe5ed) · Commits · e / os / android_frameworks_base

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -222,10 +222,12 @@ public class MediaQualityService extends SystemService {
		.getMediaProfileColumns(false), selection, selectionArguments);
		mPackageDefaultPictureProfileHandleMap.clear();
		for (PictureProfile profile : packageDefaultPictureProfiles) {
		if (isPackageDefaultPictureProfile(profile)) {
		mPackageDefaultPictureProfileHandleMap.put(
		profile.getPackageName(), profile.getHandle().getId());
		}
		}
		}
		} catch (RemoteException e) {
		Slog.e(TAG, "Failed to set ambient backlight detector callback", e);
		}
		@@ -2605,7 +2607,8 @@ public class MediaQualityService extends SystemService {
		}

		private boolean isPackageDefaultPictureProfile(PictureProfile pp) {
		if (pp == null \|\| pp.getProfileType() != PictureProfile.TYPE_SYSTEM) {
		if (pp == null \|\| pp.getProfileType() != PictureProfile.TYPE_SYSTEM
		\|\| pp.getInputId() != null) {
		return false;
		}
		String pictureProfileName = pp.getName();

+2 −1