From 8eb9c553dd0789b72587e163023631df4426823a Mon Sep 17 00:00:00 2001
From: Yabin Cui <yabinc@google.com>
Date: Thu, 8 Jun 2023 18:05:07 +0000
Subject: InputDispatcher: fix code for clang update

After clang update, we got below errors:

frameworks/native/services/inputflinger/dispatcher/InputDispatcher.cpp:5882:27:
error: declaration shadows a local variable [-Werror,-Wshadow-uncaptured-local]
    auto command = [this, application = std::move(application)]() REQUIRES(mLock) {
                          ^
frameworks/native/services/inputflinger/dispatcher/InputDispatcher.cpp:5877:75:
note: previous declaration is here
void InputDispatcher::onAnrLocked(std::shared_ptr<InputApplicationHandle> application) {
                                                                          ^
frameworks/native/services/inputflinger/dispatcher/InputDispatcher.cpp:5945:39:
error: declaration shadows a local variable [-Werror,-Wshadow-uncaptured-local]
    auto command = [this, token, pid, reason = std::move(reason)]() REQUIRES(mLock) {
                                      ^
frameworks/native/services/inputflinger/dispatcher/InputDispatcher.cpp:5944:71:
note: previous declaration is here
                                                          std::string reason) {
                                                                      ^

Bug: 280683256
Test: build with clang-r498229
Change-Id: I478067e4dff9e6d512e84ca5a9f394d4defb89ee
---
 services/inputflinger/dispatcher/InputDispatcher.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 96164c07f9..9b62894433 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -5879,9 +5879,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));
 }
@@ -5942,9 +5942,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));
 }
-- 
cgit v1.2.3-59-g8ed1b