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

Commit fcfc6c13 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Camera: Fix typos in CameraExtensionSessionImpl" into main

parents c0bda5b6 853871de

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

+3 −3
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes 
        List<CameraOutputConfig> outputConfigs = sessionConfig.outputConfigs;

        ArrayList<OutputConfiguration> outputList = new ArrayList<>();

        for (CameraOutputConfig output : outputConfigs) {

            Surface outputSurface = initializeSurfrace(output);

            Surface outputSurface = initializeSurface(output);

            if (outputSurface == null) {

                continue;

            }
@@ -234,7 +234,7 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes 
            if ((output.sharedSurfaceConfigs != null) && !output.sharedSurfaceConfigs.isEmpty()) {

                cameraOutput.enableSurfaceSharing();

                for (CameraOutputConfig sharedOutputConfig : output.sharedSurfaceConfigs) {

                    Surface sharedSurface = initializeSurfrace(sharedOutputConfig);

                    Surface sharedSurface = initializeSurface(sharedOutputConfig);

                    if (sharedSurface == null) {

                        continue;

                    }
@@ -989,7 +989,7 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes 
        return ret;

    }



    private Surface initializeSurfrace(CameraOutputConfig output) {

    private Surface initializeSurface(CameraOutputConfig output) {

        switch(output.type) {

            case CameraOutputConfig.TYPE_SURFACE:

                if (output.surface == null) {

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

+3 −3
Original line number Diff line number Diff line
@@ -1942,10 +1942,10 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { 
            HashMap<Integer, Pair<Image, TotalCaptureResult>> captureMap, Integer jpegOrientation,

            Byte jpegQuality) {

        ArrayList<CaptureBundle> ret = new ArrayList<>();

        for (Integer stagetId : captureMap.keySet()) {

            Pair<Image, TotalCaptureResult> entry = captureMap.get(stagetId);

        for (Integer stageId : captureMap.keySet()) {

            Pair<Image, TotalCaptureResult> entry = captureMap.get(stageId);

            CaptureBundle bundle = new CaptureBundle();

            bundle.stage = stagetId;

            bundle.stage = stageId;

            bundle.captureImage = initializeParcelImage(entry.first);

            bundle.sequenceId = entry.second.getSequenceId();

            bundle.captureResult = entry.second.getNativeMetadata();