diff options
| author | Chavi Weingarten <chaviw@google.com> | 2020-12-09 20:39:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-09 20:39:55 +0000 |
| commit | 1931d67b086f049d6bab2e5ddd300295ed657ae6 (patch) | |
| tree | a99cffb452e25d1bec04fb333579b1a3f065b021 | |
| parent | 082832d91d8ed940b24c7fe85bb4d6f7f66a7672 (diff) | |
| parent | 338022f3f78fc4ecb4f1f680bd5ca1e969821809 (diff) | |
| download | native-1931d67b086f049d6bab2e5ddd300295ed657ae6.tar.gz | |
resolve merge conflicts of cae2ee036040fc0dce9fc82af9bf8d85240d566b to rvc-dev am: 60f3ab275e am: 338022f3f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/13186612
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iada6af56ba8b1676513ff0804f576b84be022d06
| -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 c9e595abd1..79f99cc5d5 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; |