Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev (06b1014c) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -328,15 +328,15 @@ public class LegacyMetadataMapper {
		appendStreamConfig(availableStreamConfigs,
		ImageFormat.YUV_420_888, previewSizes);
		for (int format : p.getSupportedPreviewFormats()) {
		if (ImageFormat.isPublicFormat(format)) {
		if (ImageFormat.isPublicFormat(format) && format != ImageFormat.NV21) {
		appendStreamConfig(availableStreamConfigs, format, previewSizes);
		} else {
		} else if (VERBOSE) {
		/*
		* Do not add any formats unknown to us
		* (since it would fail runtime checks in StreamConfigurationMap)
		*/
		Log.w(TAG,
		String.format("mapStreamConfigs - Skipping non-public format %x", format));
		Log.v(TAG,
		String.format("mapStreamConfigs - Skipping format %x", format));
		}
		}

		@@ -389,8 +389,8 @@ public class LegacyMetadataMapper {
		int j = 0;
		for (String mode : antiBandingModes) {
		int convertedMode = convertAntiBandingMode(mode);
		if (convertedMode == -1) {
		Log.w(TAG, "Antibanding mode " + ((mode == null) ? "NULL" : mode) +
		if (VERBOSE && convertedMode == -1) {
		Log.v(TAG, "Antibanding mode " + ((mode == null) ? "NULL" : mode) +
		" not supported, skipping...");
		} else {
		modes[j++] = convertedMode;

+1 −1

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ public class ArrayUtils {

		// Guard against unexpected values
		if (strIndex < 0) {
		Log.w(TAG, "Ignoring invalid value " + str);
		if (VERBOSE) Log.v(TAG, "Ignoring invalid value " + str);
		continue;
		}