Merge "Camera: Clean up remaining feature_combination_query flags" into main (abc00b61) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/impl/CameraDeviceSetupImpl.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -205,10 +205,6 @@ public class CameraDeviceSetupImpl extends CameraDevice.CameraDeviceSetup {
		*/
		@SuppressWarnings("AndroidFrameworkCompatChange")
		public static boolean isCameraDeviceSetupSupported(CameraCharacteristics chars) {
		if (!Flags.featureCombinationQuery()) {
		return false;
		}

		Integer queryVersion = chars.get(
		CameraCharacteristics.INFO_SESSION_CONFIGURATION_QUERY_VERSION);
		return queryVersion != null && queryVersion > Build.VERSION_CODES.UPSIDE_DOWN_CAKE;

+10 −14

Original line number	Diff line number	Diff line
		@@ -165,13 +165,11 @@ public final class SessionConfiguration implements Parcelable {
		source.readTypedList(outConfigs, OutputConfiguration.CREATOR);
		// Ignore the values for hasSessionParameters and settings because we cannot reconstruct
		// the CaptureRequest object.
		if (Flags.featureCombinationQuery()) {
		boolean hasSessionParameters = source.readBoolean();
		if (hasSessionParameters) {
		CameraMetadataNative settings = new CameraMetadataNative();
		settings.readFromParcel(source);
		}
		}

		if ((inputWidth > 0) && (inputHeight > 0) && (inputFormat != -1)) {
		mInputConfig = new InputConfiguration(inputWidth, inputHeight,
		@@ -212,7 +210,6 @@ public final class SessionConfiguration implements Parcelable {
		dest.writeBoolean(/isMultiResolution/ false);
		}
		dest.writeTypedList(mOutputConfigurations);
		if (Flags.featureCombinationQuery()) {
		if (mSessionParameters != null) {
		dest.writeBoolean(/hasSessionParameters/true);
		CameraMetadataNative metadata = mSessionParameters.getNativeCopy();
		@@ -221,7 +218,6 @@ public final class SessionConfiguration implements Parcelable {
		dest.writeBoolean(/hasSessionParameters/false);
		}
		}
		}

		@Override
		public int describeContents() {