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

Commit 6d0b7083 authored by Gigon Bae's avatar Gigon Bae Committed by android-build-merger
Browse files

Merge "Camera: parse preview fps and fps range correctly" am: 4d9abd93 

am: 35be00e8

Change-Id: I840520af5fb08bea112ce0927ddfdde6df322bf3
parents 2fd1f62a 35be00e8

services/camera/libcameraservice/api1/client2/Parameters.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1324,8 +1324,8 @@ status_t Parameters::set(const String8& paramString) { 
    {

        const char *fpsRange, *fpsSingle;



        fpsRange = newParams.get(CameraParameters::KEY_PREVIEW_FRAME_RATE);

        fpsSingle = newParams.get(CameraParameters::KEY_PREVIEW_FPS_RANGE);

        fpsSingle = newParams.get(CameraParameters::KEY_PREVIEW_FRAME_RATE);

        fpsRange = newParams.get(CameraParameters::KEY_PREVIEW_FPS_RANGE);



        /**

         * Pick either the range or the single key if only one was set.