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

Commit 219fdf18 authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Clean up remaining feature_combination_query flags 

Flag: EXEMPT removing feature_combination_query
Test: Build
Bug: 365555185
Change-Id: Iae352624b1d6e31782faa2dbe8a34e93d675efd9
parent 923a70fc

core/java/android/hardware/camera2/CameraCharacteristics.java

+0 −2
Original line number Diff line number Diff line
@@ -567,7 +567,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * @see #INFO_SESSION_CONFIGURATION_QUERY_VERSION

     */

    @NonNull

    @FlaggedApi(Flags.FLAG_FEATURE_COMBINATION_QUERY)

    public List<CameraCharacteristics.Key<?>> getAvailableSessionCharacteristicsKeys() {

        if (mAvailableSessionCharacteristicsKeys != null) {

            return mAvailableSessionCharacteristicsKeys;
@@ -5210,7 +5209,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     */

    @PublicKey

    @NonNull

    @FlaggedApi(Flags.FLAG_FEATURE_COMBINATION_QUERY)

    public static final Key<Integer> INFO_SESSION_CONFIGURATION_QUERY_VERSION =

            new Key<Integer>("android.info.sessionConfigurationQueryVersion", int.class);

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;

core/java/android/hardware/camera2/params/SessionConfiguration.java

+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() {