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

Commit ad71615f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Skip extension queries on unsupported devices" into main

parents 085e6b54 3a93e023

core/java/android/hardware/camera2/CameraExtensionCharacteristics.java

+6 −0
Original line number Diff line number Diff line
@@ -461,6 +461,12 @@ public final class CameraExtensionCharacteristics { 
        @SuppressLint("NonUserGetterCalled")

        public boolean registerClient(Context ctx, IBinder token, int extension,

                String cameraId, Map<String, CameraMetadataNative> characteristicsMapNative) {

            if (!SystemProperties.getBoolean("ro.camerax.extensions.enabled",

                    /*default*/ false)) {

                Log.v(TAG, "Disabled camera extension property!");

                return false;

            }



            boolean ret = registerClientHelper(ctx, token, extension, false /*useFallback*/);



            if (Flags.concertMode()) {