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

Commit ced952ff authored by Yabin Cui's avatar Yabin Cui
Browse files

[conflict] Merge "InputDispatcher: fix code for clang update" am: 2bde961a... 

[conflict] Merge "InputDispatcher: fix code for clang update" am: 2bde961a am: 8e0107a7 am: bca972ba

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2619153



Change-Id: Ie463ef83f75efe0cca36f12b0fdf8376c0bec275
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed7522a5 bca972ba

services/inputflinger/dispatcher/InputDispatcher.cpp

+4 −4
Original line number Diff line number Diff line
@@ -6190,9 +6190,9 @@ void InputDispatcher::onAnrLocked(std::shared_ptr<InputApplicationHandle> applic 
            StringPrintf("%s does not have a focused window", application->getName().c_str());

    updateLastAnrStateLocked(*application, reason);



    auto command = [this, application = std::move(application)]() REQUIRES(mLock) {

    auto command = [this, app = std::move(application)]() REQUIRES(mLock) {

        scoped_unlock unlock(mLock);

        mPolicy.notifyNoFocusedWindowAnr(application);

        mPolicy.notifyNoFocusedWindowAnr(app);

    };

    postCommandLocked(std::move(command));

}
@@ -6252,9 +6252,9 @@ void InputDispatcher::doInterceptKeyBeforeDispatchingCommand(const sp<IBinder>& 
void InputDispatcher::sendWindowUnresponsiveCommandLocked(const sp<IBinder>& token,

                                                          std::optional<int32_t> pid,

                                                          std::string reason) {

    auto command = [this, token, pid, reason = std::move(reason)]() REQUIRES(mLock) {

    auto command = [this, token, pid, r = std::move(reason)]() REQUIRES(mLock) {

        scoped_unlock unlock(mLock);

        mPolicy.notifyWindowUnresponsive(token, pid, reason);

        mPolicy.notifyWindowUnresponsive(token, pid, r);

    };

    postCommandLocked(std::move(command));

}