Have vr flinger take the display after boot on standalones
1. Have vr flinger request the display immediately after boot finishes
on standalones, to prevent incorrectly showing normal 2d content from
surface flinger on the display during startup.
2. If we don't get any surfaces to show for a while after boot finishes,
turn the display off. This should only occur if VrCore is misbehaving
somehow.
Bug: 65742855
Test: - Verified no flickering in the boot anim.
- Verified that if no surfaces are created the display is turned off.
Change-Id: Ibfcd97101334e552d1d562fe4ae9c36877b44397
diff --git a/libs/vr/libvrflinger/hardware_composer.h b/libs/vr/libvrflinger/hardware_composer.h
index 9ed4b22..1d0c7ef 100644
--- a/libs/vr/libvrflinger/hardware_composer.h
+++ b/libs/vr/libvrflinger/hardware_composer.h
@@ -327,6 +327,9 @@
// it's paused. This should only be called from surface flinger's main thread.
void Disable();
+ // Called on a binder thread.
+ void OnBootFinished();
+
// Get the HMD display metrics for the current display.
display::Metrics GetHmdDisplayMetrics() const;
@@ -434,6 +437,16 @@
// Called on the post thread when the post thread is paused or quits.
void OnPostThreadPaused();
+ // Use post_thread_wait_ to wait for a specific condition, specified by pred.
+ // timeout_sec < 0 means wait indefinitely, otherwise it specifies the timeout
+ // in seconds.
+ // The lock must be held when this function is called.
+ // Returns true if the wait was interrupted because the post thread was asked
+ // to quit.
+ bool PostThreadCondWait(std::unique_lock<std::mutex>& lock,
+ int timeout_sec,
+ const std::function<bool()>& pred);
+
// Map the given shared memory buffer to our broadcast ring to track updates
// to the config parameters.
int MapConfigBuffer(IonBuffer& ion_buffer);
@@ -482,6 +495,10 @@
std::condition_variable post_thread_wait_;
std::condition_variable post_thread_ready_;
+ // When boot is finished this will be set to true and the post thread will be
+ // notified via post_thread_wait_.
+ bool boot_finished_ = false;
+
// Backlight LED brightness sysfs node.
pdx::LocalHandle backlight_brightness_fd_;