diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-12-11 00:06:58 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-12-11 00:06:58 +0000 |
commit | 5c8192acda8db221080e16e0fddf4c4f8855de46 (patch) | |
tree | a99cffb452e25d1bec04fb333579b1a3f065b021 | |
parent | 372c23a271fbc8db5b98533af1320572ab1702cd (diff) | |
parent | 1931d67b086f049d6bab2e5ddd300295ed657ae6 (diff) | |
download | native-5c8192acda8db221080e16e0fddf4c4f8855de46.tar.gz |
Snap for 7025657 from 1931d67b086f049d6bab2e5ddd300295ed657ae6 to rvc-qpr2-release
Change-Id: I464d354bad4aed915a16d5d5fc9817eff137f1c4
-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; |