diff options
| author | Chavi Weingarten <chaviw@google.com> | 2020-12-09 20:21:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-09 20:21:56 +0000 |
| commit | 338022f3f78fc4ecb4f1f680bd5ca1e969821809 (patch) | |
| tree | 27b51dbe6a75c14b37db53b2f09aaf66730b6c5c | |
| parent | 000700590a1c14e3dba970cca7ae36c4cd1605a4 (diff) | |
| parent | 60f3ab275ef3ddf3afcdfdce4eb09b59024fec51 (diff) | |
| download | native-338022f3f78fc4ecb4f1f680bd5ca1e969821809.tar.gz | |
resolve merge conflicts of cae2ee036040fc0dce9fc82af9bf8d85240d566b to rvc-dev am: 60f3ab275e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/13186612
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I065dc674678b9218920def3e7b347a1580fbd7de
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 0ac3d329e9..712dc2a3aa 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -600,13 +600,6 @@ void SurfaceFlinger::bootFinished() 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(); @@ -621,7 +614,15 @@ void SurfaceFlinger::bootFinished() 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; |