commit cae2ee036040fc0dce9fc82af9bf8d85240d566b
author Denis Hsu <denis.hsu@mediatek.com> Wed Dec 09 00:07:00 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 09 00:07:00 2020 +0000
tree 26d372b333d90aeff80bd3658a7391614daf2d37
parent 995b24692cd557b71b46be0a402ad8b0ee5c1a09
parent 58fbf9fb2c82ee09b0d572e0936b8370c4d35aef

SF: update mInputFlinger on main thread am: 58fbf9fb2c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaadcaf40d980ad9c92bb404193da37614c576a0d

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 3f32d05..e8ddb0c 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -544,13 +544,6 @@
     if (window != 0) {
         window->linkToDeath(static_cast<IBinder::DeathRecipient*>(this));
     }
-    sp<IBinder> input(defaultServiceManager()->getService(
-            String16("inputflinger")));
-    if (input == nullptr) {
-        ALOGE("Failed to link to input service");
-    } else {
-        mInputFlinger = interface_cast<IInputFlinger>(input);
-    }
 
     if (mVrFlinger) {
       mVrFlinger->OnBootFinished();
@@ -565,7 +558,15 @@
     LOG_EVENT_LONG(LOGTAG_SF_STOP_BOOTANIM,
                    ns2ms(systemTime(SYSTEM_TIME_MONOTONIC)));
 
-    postMessageAsync(new LambdaMessage([this]() NO_THREAD_SAFETY_ANALYSIS {
+    sp<IBinder> input(defaultServiceManager()->getService(String16("inputflinger")));
+
+    postMessageAsync(new LambdaMessage([=]() NO_THREAD_SAFETY_ANALYSIS {
+        if (input == nullptr) {
+            ALOGE("Failed to link to input service");
+        } else {
+            mInputFlinger = interface_cast<IInputFlinger>(input);
+        }
+
         readPersistentProperties();
         mBootStage = BootStage::FINISHED;