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

Commit 48225182 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Fix a typo in the 3.7 device comment" into sc-dev am: bca91a0f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15190373

Change-Id: Iac7b67e3a3a4adeb138a8d5c15694e8ea945f0d3
parents 331c17ee bca91a0f

camera/device/3.7/types.hal

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ struct Stream { 
    /**

     * The surface group id used for multi-resolution output streams.

     *

     * This works simliar to the surfaceGroupId of OutputConfiguration in the

     * This works similar to the surfaceGroupId of OutputConfiguration in the

     * public API, with the exception that this is for multi-resolution image

     * reader and is used by the camera HAL to choose a target stream within

     * the same group to which images are written. All streams in the same group

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ c17d9e27abd37ae5a8ff8da08fc5c9b13a264670feef6bbbc9d3ab1915216130 android.hardwar 
1a1dff6e8d25dbc02a69fed3c077dd0782b30331ca3f345848ec52fc67744224 android.hardware.camera.device@3.7::ICameraDevice

3be6faa3d11ad9c7ec01a1a0a009cf11cb65d701d109dab37613ce9cfb3cdd60 android.hardware.camera.device@3.7::ICameraDeviceSession

3740ec773b2eb8fa6bd8c6e879eedb56c4e4306b88f1c20fa51103d791d871b1 android.hardware.camera.device@3.7::ICameraInjectionSession

21f023685571daf46148097d98b89cea353f07e3ed83b2ed5685b23bd136c3ee android.hardware.camera.device@3.7::types

d272697484c41bbf76a0924d2aaebf065ce37a822fcb438316eb5dd2d112f052 android.hardware.camera.device@3.7::types

e932e7ef95210142e1fd3a4504e1d19bdb1acc988450f1ced543f3401f67855a android.hardware.camera.metadata@3.6::types

98ff825a7d37e5ab983502d13cec1f2e5a9cac9b674b6ff1a52bcf540f4e315e android.hardware.camera.provider@2.7::ICameraProvider

51fd14005859b16be55872660c34f5d423c77a2abcc5d4bdd5a537c40f32516b android.hardware.camera.provider@2.7::types