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

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

Merge "Camera: Fix CPU hogging when flush() is called after device goes idle"...

Merge "Camera: Fix CPU hogging when flush() is called after device goes idle" into tm-dev am: ebb5db24 am: b6f1f7d4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18527849



Change-Id: I93ac5a7cd4915379fdeca325400206a305a9bf8c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 153ecdb3 b6f1f7d4
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -4265,8 +4265,8 @@ sp<Camera3Device::CaptureRequest>
                if (parent != nullptr) {
                    parent->mRequestBufferSM.onRequestThreadPaused();
                }
                mRequestClearing = false;
            }
            mRequestClearing = false;
            // Stop waiting for now and let thread management happen
            return NULL;
        }