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

Commit 08ebb6b1 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Camera2: Fix SCENE_MODE" into jb-mr1-dev

parents 7df98f17 3cc89794

services/camera/libcameraservice/Camera2Client.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1302,7 +1302,8 @@ status_t Camera2Client::setParameters(const String8& params) { 
    // SCENE_MODE

    int sceneMode = sceneModeStringToEnum(

        newParams.get(CameraParameters::KEY_SCENE_MODE) );

    if (sceneMode != k.mParameters.sceneMode) {

    if (sceneMode != k.mParameters.sceneMode &&

            sceneMode != ANDROID_CONTROL_SCENE_MODE_UNSUPPORTED) {

        camera_metadata_entry_t availableSceneModes =

            staticInfo(ANDROID_CONTROL_AVAILABLE_SCENE_MODES);

        for (i = 0; i < availableSceneModes.count; i++) {