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

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

Merge "Camera: Remove flag "concert_mode"" into main

parents cbd07517 ce764349

core/api/current.txt

+7 −7
Original line number Diff line number Diff line
@@ -19396,7 +19396,7 @@ package android.hardware.camera2 { 
  public abstract static class CameraExtensionSession.ExtensionCaptureCallback {

    ctor public CameraExtensionSession.ExtensionCaptureCallback();

    method public void onCaptureFailed(@NonNull android.hardware.camera2.CameraExtensionSession, @NonNull android.hardware.camera2.CaptureRequest);

    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void onCaptureFailed(@NonNull android.hardware.camera2.CameraExtensionSession, @NonNull android.hardware.camera2.CaptureRequest, int);

    method public void onCaptureFailed(@NonNull android.hardware.camera2.CameraExtensionSession, @NonNull android.hardware.camera2.CaptureRequest, int);

    method public void onCaptureProcessProgressed(@NonNull android.hardware.camera2.CameraExtensionSession, @NonNull android.hardware.camera2.CaptureRequest, @IntRange(from=0, to=100) int);

    method public void onCaptureProcessStarted(@NonNull android.hardware.camera2.CameraExtensionSession, @NonNull android.hardware.camera2.CaptureRequest);

    method public void onCaptureResultAvailable(@NonNull android.hardware.camera2.CameraExtensionSession, @NonNull android.hardware.camera2.CaptureRequest, @NonNull android.hardware.camera2.TotalCaptureResult);
@@ -19921,7 +19921,7 @@ package android.hardware.camera2 { 
    field @Deprecated @NonNull public static final android.hardware.camera2.CaptureResult.Key<float[]> LENS_RADIAL_DISTORTION;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> LENS_STATE;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.String> LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_ID;

    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.graphics.Rect> LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_SENSOR_CROP_REGION;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.graphics.Rect> LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_SENSOR_CROP_REGION;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> NOISE_REDUCTION_MODE;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> REPROCESS_EFFECTIVE_EXPOSURE_FACTOR;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Byte> REQUEST_PIPELINE_DEPTH;
@@ -19947,7 +19947,7 @@ package android.hardware.camera2 { 
    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> STATISTICS_FACE_DETECT_MODE;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.graphics.Point[]> STATISTICS_HOT_PIXEL_MAP;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Boolean> STATISTICS_HOT_PIXEL_MAP_MODE;

    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.LensIntrinsicsSample[]> STATISTICS_LENS_INTRINSICS_SAMPLES;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.LensIntrinsicsSample[]> STATISTICS_LENS_INTRINSICS_SAMPLES;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.LensShadingMap> STATISTICS_LENS_SHADING_CORRECTION_MAP;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> STATISTICS_LENS_SHADING_MAP_MODE;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> STATISTICS_OIS_DATA_MODE;
@@ -20107,10 +20107,10 @@ package android.hardware.camera2.params { 
    method public boolean isMultiResolution();

  }













  @FlaggedApi("com.android.internal.camera.flags.concert_mode") public final class LensIntrinsicsSample {













    ctor @FlaggedApi("com.android.internal.camera.flags.concert_mode") public LensIntrinsicsSample(long, @NonNull float[]);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public float[] getLensIntrinsics();













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public long getTimestampNanos();













  public final class LensIntrinsicsSample {













    ctor public LensIntrinsicsSample(long, @NonNull float[]);













    method @NonNull public float[] getLensIntrinsics();













    method public long getTimestampNanos();















  }





























  public final class LensShadingMap {

























core/api/system-current.txt



+68
−68




























Original line number
Diff line number
Diff line








@@ -4950,94 +4950,94 @@ package android.hardware.camera2 {



























package android.hardware.camera2.extension {



























  @FlaggedApi("com.android.internal.camera.flags.concert_mode") public abstract class AdvancedExtender {













    ctor @FlaggedApi("com.android.internal.camera.flags.concert_mode") public AdvancedExtender(@NonNull android.hardware.camera2.CameraManager);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public abstract java.util.List<android.hardware.camera2.CaptureRequest.Key> getAvailableCaptureRequestKeys(@NonNull String);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public abstract java.util.List<android.hardware.camera2.CaptureResult.Key> getAvailableCaptureResultKeys(@NonNull String);













    method @FlaggedApi("com.android.internal.camera.flags.camera_extensions_characteristics_get") @NonNull public abstract java.util.List<android.util.Pair<android.hardware.camera2.CameraCharacteristics.Key,java.lang.Object>> getAvailableCharacteristicsKeyValues();













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public long getMetadataVendorId(@NonNull String);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public abstract android.hardware.camera2.extension.SessionProcessor getSessionProcessor();













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public abstract java.util.Map<java.lang.Integer,java.util.List<android.util.Size>> getSupportedCaptureOutputResolutions(@NonNull String);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public abstract java.util.Map<java.lang.Integer,java.util.List<android.util.Size>> getSupportedPreviewOutputResolutions(@NonNull String);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public abstract void initialize(@NonNull String, @NonNull android.hardware.camera2.extension.CharacteristicsMap);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public abstract boolean isExtensionAvailable(@NonNull String, @NonNull android.hardware.camera2.extension.CharacteristicsMap);













  }

























  @FlaggedApi("com.android.internal.camera.flags.concert_mode") public abstract class CameraExtensionService extends android.app.Service {













    ctor @FlaggedApi("com.android.internal.camera.flags.concert_mode") protected CameraExtensionService();













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public final android.os.IBinder onBind(@Nullable android.content.Intent);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public abstract android.hardware.camera2.extension.AdvancedExtender onInitializeAdvancedExtension(int);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public abstract boolean onRegisterClient(@NonNull android.os.IBinder);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public abstract void onUnregisterClient(@NonNull android.os.IBinder);













  }

























  @FlaggedApi("com.android.internal.camera.flags.concert_mode") public final class CameraOutputSurface {













    ctor @FlaggedApi("com.android.internal.camera.flags.concert_mode") public CameraOutputSurface(@NonNull android.view.Surface, @NonNull android.util.Size);













  public abstract class AdvancedExtender {













    ctor public AdvancedExtender(@NonNull android.hardware.camera2.CameraManager);













    method @NonNull public abstract java.util.List<android.hardware.camera2.CaptureRequest.Key> getAvailableCaptureRequestKeys(@NonNull String);













    method @NonNull public abstract java.util.List<android.hardware.camera2.CaptureResult.Key> getAvailableCaptureResultKeys(@NonNull String);













    method @NonNull public abstract java.util.List<android.util.Pair<android.hardware.camera2.CameraCharacteristics.Key,java.lang.Object>> getAvailableCharacteristicsKeyValues();













    method public long getMetadataVendorId(@NonNull String);













    method @NonNull public abstract android.hardware.camera2.extension.SessionProcessor getSessionProcessor();













    method @NonNull public abstract java.util.Map<java.lang.Integer,java.util.List<android.util.Size>> getSupportedCaptureOutputResolutions(@NonNull String);













    method @NonNull public abstract java.util.Map<java.lang.Integer,java.util.List<android.util.Size>> getSupportedPreviewOutputResolutions(@NonNull String);













    method public abstract void initialize(@NonNull String, @NonNull android.hardware.camera2.extension.CharacteristicsMap);













    method public abstract boolean isExtensionAvailable(@NonNull String, @NonNull android.hardware.camera2.extension.CharacteristicsMap);













  }

























  public abstract class CameraExtensionService extends android.app.Service {













    ctor protected CameraExtensionService();













    method @NonNull public final android.os.IBinder onBind(@Nullable android.content.Intent);













    method @NonNull public abstract android.hardware.camera2.extension.AdvancedExtender onInitializeAdvancedExtension(int);













    method public abstract boolean onRegisterClient(@NonNull android.os.IBinder);













    method public abstract void onUnregisterClient(@NonNull android.os.IBinder);













  }

























  public final class CameraOutputSurface {













    ctor public CameraOutputSurface(@NonNull android.view.Surface, @NonNull android.util.Size);















    method public int getColorSpace();















    method public long getDynamicRangeProfile();













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public int getImageFormat();













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public android.util.Size getSize();













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public android.view.Surface getSurface();













    method public int getImageFormat();













    method @NonNull public android.util.Size getSize();













    method @NonNull public android.view.Surface getSurface();















    method public void setDynamicRangeProfile(long);















  }



























  @FlaggedApi("com.android.internal.camera.flags.concert_mode") public class CharacteristicsMap {













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @Nullable public android.hardware.camera2.CameraCharacteristics get(@NonNull String);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public java.util.Set<java.lang.String> getCameraIds();













  public class CharacteristicsMap {













    method @Nullable public android.hardware.camera2.CameraCharacteristics get(@NonNull String);













    method @NonNull public java.util.Set<java.lang.String> getCameraIds();















  }



























  @FlaggedApi("com.android.internal.camera.flags.concert_mode") public class ExtensionConfiguration {













    ctor @FlaggedApi("com.android.internal.camera.flags.concert_mode") public ExtensionConfiguration(int, int, @NonNull java.util.List<android.hardware.camera2.extension.ExtensionOutputConfiguration>, @Nullable android.hardware.camera2.CaptureRequest);













  public class ExtensionConfiguration {













    ctor public ExtensionConfiguration(int, int, @NonNull java.util.List<android.hardware.camera2.extension.ExtensionOutputConfiguration>, @Nullable android.hardware.camera2.CaptureRequest);















    method public void setColorSpace(int);















  }



























  @FlaggedApi("com.android.internal.camera.flags.concert_mode") public class ExtensionOutputConfiguration {













    ctor @FlaggedApi("com.android.internal.camera.flags.concert_mode") public ExtensionOutputConfiguration(@NonNull java.util.List<android.hardware.camera2.extension.CameraOutputSurface>, int, @Nullable String, int);













  public class ExtensionOutputConfiguration {













    ctor public ExtensionOutputConfiguration(@NonNull java.util.List<android.hardware.camera2.extension.CameraOutputSurface>, int, @Nullable String, int);















  }



























  @FlaggedApi("com.android.internal.camera.flags.concert_mode") public final class RequestProcessor {













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void abortCaptures();













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public int setRepeating(@NonNull android.hardware.camera2.extension.RequestProcessor.Request, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.extension.RequestProcessor.RequestCallback) throws android.hardware.camera2.CameraAccessException;













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void stopRepeating();













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public int submit(@NonNull android.hardware.camera2.extension.RequestProcessor.Request, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.extension.RequestProcessor.RequestCallback) throws android.hardware.camera2.CameraAccessException;













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public int submitBurst(@NonNull java.util.List<android.hardware.camera2.extension.RequestProcessor.Request>, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.extension.RequestProcessor.RequestCallback) throws android.hardware.camera2.CameraAccessException;













  public final class RequestProcessor {













    method public void abortCaptures();













    method public int setRepeating(@NonNull android.hardware.camera2.extension.RequestProcessor.Request, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.extension.RequestProcessor.RequestCallback) throws android.hardware.camera2.CameraAccessException;













    method public void stopRepeating();













    method public int submit(@NonNull android.hardware.camera2.extension.RequestProcessor.Request, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.extension.RequestProcessor.RequestCallback) throws android.hardware.camera2.CameraAccessException;













    method public int submitBurst(@NonNull java.util.List<android.hardware.camera2.extension.RequestProcessor.Request>, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.extension.RequestProcessor.RequestCallback) throws android.hardware.camera2.CameraAccessException;















  }



























  @FlaggedApi("com.android.internal.camera.flags.concert_mode") public static final class RequestProcessor.Request {













    ctor @FlaggedApi("com.android.internal.camera.flags.concert_mode") public RequestProcessor.Request(@NonNull java.util.List<java.lang.Integer>, @NonNull java.util.List<android.util.Pair<android.hardware.camera2.CaptureRequest.Key,java.lang.Object>>, int);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public java.util.List<android.util.Pair<android.hardware.camera2.CaptureRequest.Key,java.lang.Object>> getParameters();













  public static final class RequestProcessor.Request {













    ctor public RequestProcessor.Request(@NonNull java.util.List<java.lang.Integer>, @NonNull java.util.List<android.util.Pair<android.hardware.camera2.CaptureRequest.Key,java.lang.Object>>, int);













    method @NonNull public java.util.List<android.util.Pair<android.hardware.camera2.CaptureRequest.Key,java.lang.Object>> getParameters();















  }



























  @FlaggedApi("com.android.internal.camera.flags.concert_mode") public static interface RequestProcessor.RequestCallback {













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void onCaptureBufferLost(@NonNull android.hardware.camera2.extension.RequestProcessor.Request, long, int);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void onCaptureCompleted(@NonNull android.hardware.camera2.extension.RequestProcessor.Request, @Nullable android.hardware.camera2.TotalCaptureResult);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void onCaptureFailed(@NonNull android.hardware.camera2.extension.RequestProcessor.Request, @NonNull android.hardware.camera2.CaptureFailure);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void onCaptureProgressed(@NonNull android.hardware.camera2.extension.RequestProcessor.Request, @NonNull android.hardware.camera2.CaptureResult);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void onCaptureSequenceAborted(int);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void onCaptureSequenceCompleted(int, long);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void onCaptureStarted(@NonNull android.hardware.camera2.extension.RequestProcessor.Request, long, long);













  public static interface RequestProcessor.RequestCallback {













    method public void onCaptureBufferLost(@NonNull android.hardware.camera2.extension.RequestProcessor.Request, long, int);













    method public void onCaptureCompleted(@NonNull android.hardware.camera2.extension.RequestProcessor.Request, @Nullable android.hardware.camera2.TotalCaptureResult);













    method public void onCaptureFailed(@NonNull android.hardware.camera2.extension.RequestProcessor.Request, @NonNull android.hardware.camera2.CaptureFailure);













    method public void onCaptureProgressed(@NonNull android.hardware.camera2.extension.RequestProcessor.Request, @NonNull android.hardware.camera2.CaptureResult);













    method public void onCaptureSequenceAborted(int);













    method public void onCaptureSequenceCompleted(int, long);













    method public void onCaptureStarted(@NonNull android.hardware.camera2.extension.RequestProcessor.Request, long, long);















  }



























  @FlaggedApi("com.android.internal.camera.flags.concert_mode") public abstract class SessionProcessor {













    ctor @FlaggedApi("com.android.internal.camera.flags.concert_mode") public SessionProcessor();













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public abstract void deInitSession(@NonNull android.os.IBinder);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public abstract android.hardware.camera2.extension.ExtensionConfiguration initSession(@NonNull android.os.IBinder, @NonNull String, @NonNull android.hardware.camera2.extension.CharacteristicsMap, @NonNull android.hardware.camera2.extension.CameraOutputSurface, @NonNull android.hardware.camera2.extension.CameraOutputSurface);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public abstract void onCaptureSessionEnd();













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public abstract void onCaptureSessionStart(@NonNull android.hardware.camera2.extension.RequestProcessor, @NonNull String);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public abstract void setParameters(@NonNull android.hardware.camera2.CaptureRequest);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public abstract int startMultiFrameCapture(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.extension.SessionProcessor.CaptureCallback);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public abstract int startRepeating(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.extension.SessionProcessor.CaptureCallback);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public abstract int startTrigger(@NonNull android.hardware.camera2.CaptureRequest, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.extension.SessionProcessor.CaptureCallback);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public abstract void stopRepeating();













  public abstract class SessionProcessor {













    ctor public SessionProcessor();













    method public abstract void deInitSession(@NonNull android.os.IBinder);













    method @NonNull public abstract android.hardware.camera2.extension.ExtensionConfiguration initSession(@NonNull android.os.IBinder, @NonNull String, @NonNull android.hardware.camera2.extension.CharacteristicsMap, @NonNull android.hardware.camera2.extension.CameraOutputSurface, @NonNull android.hardware.camera2.extension.CameraOutputSurface);













    method public abstract void onCaptureSessionEnd();













    method public abstract void onCaptureSessionStart(@NonNull android.hardware.camera2.extension.RequestProcessor, @NonNull String);













    method public abstract void setParameters(@NonNull android.hardware.camera2.CaptureRequest);













    method public abstract int startMultiFrameCapture(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.extension.SessionProcessor.CaptureCallback);













    method public abstract int startRepeating(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.extension.SessionProcessor.CaptureCallback);













    method public abstract int startTrigger(@NonNull android.hardware.camera2.CaptureRequest, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.extension.SessionProcessor.CaptureCallback);













    method public abstract void stopRepeating();















  }



























  @FlaggedApi("com.android.internal.camera.flags.concert_mode") public static interface SessionProcessor.CaptureCallback {













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void onCaptureCompleted(long, int, @NonNull java.util.Map<android.hardware.camera2.CaptureResult.Key,java.lang.Object>);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void onCaptureFailed(int, int);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void onCaptureProcessStarted(int);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void onCaptureSequenceAborted(int);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void onCaptureSequenceCompleted(int);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public void onCaptureStarted(int, long);













  public static interface SessionProcessor.CaptureCallback {













    method public void onCaptureCompleted(long, int, @NonNull java.util.Map<android.hardware.camera2.CaptureResult.Key,java.lang.Object>);













    method public void onCaptureFailed(int, int);













    method public void onCaptureProcessStarted(int);













    method public void onCaptureSequenceAborted(int);













    method public void onCaptureSequenceCompleted(int);













    method public void onCaptureStarted(int, long);















  }





























}

























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



+19
−23




























Original line number
Diff line number
Diff line








@@ -259,10 +259,8 @@ public final class CameraExtensionCharacteristics {













        private static final String PROXY_SERVICE_NAME =















                "com.android.cameraextensions.CameraExtensionsProxyService";





























        @FlaggedApi(Flags.FLAG_CONCERT_MODE)















        private static final int FALLBACK_PACKAGE_NAME =















                com.android.internal.R.string.config_extensionFallbackPackageName;













        @FlaggedApi(Flags.FLAG_CONCERT_MODE)















        private static final int FALLBACK_SERVICE_NAME =















                com.android.internal.R.string.config_extensionFallbackServiceName;


























@@ -309,7 +307,7 @@ public final class CameraExtensionCharacteristics {













                  intent.setClassName(vendorProxyPackage, vendorProxyService);















                }





























                if (Flags.concertMode() && useFallback) {













                if (useFallback) {















                    String packageName = ctx.getResources().getString(FALLBACK_PACKAGE_NAME);















                    String serviceName = ctx.getResources().getString(FALLBACK_SERVICE_NAME);


























@@ -433,7 +431,7 @@ public final class CameraExtensionCharacteristics {













                    releaseProxyConnectionLocked(ctx, extension);















                }





























                if (Flags.concertMode() && ret && useFallback && mIsFallbackEnabled) {













                if (ret && useFallback && mIsFallbackEnabled) {















                    try {















                        InitializeSessionHandler cb = new InitializeSessionHandler(ctx);















                        initializeSession(cb, extension);










@@ -462,7 +460,6 @@ public final class CameraExtensionCharacteristics {





























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





























            if (Flags.concertMode()) {















            // Check if user enabled fallback impl















            ContentResolver resolver = ctx.getContentResolver();















            int userEnabled = Settings.Secure.getInt(resolver,









@@ -482,7 +479,6 @@ public final class CameraExtensionCharacteristics {













                unregisterClient(ctx, token, extension);















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















            }













            }































            return ret;















        }

































core/java/android/hardware/camera2/CameraExtensionSession.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -156,7 +156,6 @@ public abstract class CameraExtensionSession implements AutoCloseable {













         * @see #capture















         * @see #setRepeatingRequest















         */













        @FlaggedApi(Flags.FLAG_CONCERT_MODE)















        public void onCaptureFailed(@NonNull CameraExtensionSession session,















                @NonNull CaptureRequest request, @CaptureFailure.FailureReason int failure) {















            // default empty implementation

































core/java/android/hardware/camera2/CaptureResult.java



+0
−4


























File changed.
Preview size limit exceeded, changes collapsed.