commit 38f9224cdc4d399041370113d26cbf1dc69cec2a
author Kevin F. Haggerty <haggertk@lineageos.org> Thu Feb 04 07:57:08 2021 -0700
committer techyminati <sinha.aryan03@gmail.com> Wed Feb 10 14:27:37 2021 +0000
tree 4872c7b57052da1ce98d2badd3a1054d746575d0
parent 144dd1eacc73e1f888206fecced034258abbd345

Merge tag 'android-11.0.0_r29' into staging/lineage-18.1_merge-android-11.0.0_r29

Android 11.0.0 release 29

* tag 'android-11.0.0_r29':
  resolve merge conflicts of cae2ee036040fc0dce9fc82af9bf8d85240d566b to rvc-dev

Change-Id: I392f5da9579f0f1ce4078de15ebafed7121c39bb

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 2048fd4..493d2de 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -608,13 +608,6 @@
     if (mWindowManager != 0) {
         mWindowManager->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();
@@ -629,7 +622,15 @@
     LOG_EVENT_LONG(LOGTAG_SF_STOP_BOOTANIM,
                    ns2ms(systemTime(SYSTEM_TIME_MONOTONIC)));
 
-    static_cast<void>(schedule([this] {
+    sp<IBinder> input(defaultServiceManager()->getService(String16("inputflinger")));
+
+    static_cast<void>(schedule([=] {
+        if (input == nullptr) {
+            ALOGE("Failed to link to input service");
+        } else {
+            mInputFlinger = interface_cast<IInputFlinger>(input);
+        }
+
         readPersistentProperties();
         mPowerAdvisor.onBootFinished();
         mBootStage = BootStage::FINISHED;