Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera: Fix typos in CameraExtensionSessionImpl" into main am: fcfc6c13f5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2682589

Change-Id: I037f55ee122dcd59be28a63a50dbbff963e4463a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-01 01:41:04 +00:00
committed by Automerger Merge Worker
parent 782db8014b fcfc6c13f5
commit 94bc8b828c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java
View File

@@ -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) {

6
core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java
View File

@@ -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();