commit 90c207706ceb274ea7bb45a3f993d92d2adb52a8
author android-build-team Robot <android-build-team-robot@google.com> Fri Jan 15 19:18:34 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jan 15 19:18:34 2021 +0000
tree 26d372b333d90aeff80bd3658a7391614daf2d37
parent 55a0add14d38f8d021203c0038af83ead194df4e
parent cae2ee036040fc0dce9fc82af9bf8d85240d566b

Snap for 7084909 from cae2ee036040fc0dce9fc82af9bf8d85240d566b to qt-aml-tzdata-release

Change-Id: Ibbb4bf62fb2f33a66dd3679577adf7b9302fc90f

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;