Merge "recovery: fastbootd: retry opening graphics" (082bea63) · Commits · e / os / android_bootable_recovery

recovery_ui/screen_ui.cpp

+20 −1

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@
		#include <unordered_map>
		#include <vector>

		#include <android-base/chrono_utils.h>
		#include <android-base/logging.h>
		#include <android-base/properties.h>
		#include <android-base/stringprintf.h>
		@@ -881,10 +882,28 @@ bool ScreenRecoveryUI::LoadWipeDataMenuText() {
		return true;
		}

		static bool InitGraphics() {
		// Timeout is same as init wait for file default of 5 seconds and is arbitrary
		const unsigned timeout = 500; // 10ms increments
		for (auto retry = timeout; retry > 0; --retry) {
		if (gr_init() == 0) {
		if (retry < timeout) {
		// Log message like init wait for file completion log for consistency.
		LOG(WARNING) << "wait for 'graphics' took " << ((timeout - retry) * 10) << "ms";
		}
		return true;
		}
		std::this_thread::sleep_for(10ms);
		}
		// Log message like init wait for file timeout log for consistency.
		LOG(ERROR) << "timeout wait for 'graphics' took " << (timeout * 10) << "ms";
		return false;
		}

		bool ScreenRecoveryUI::Init(const std::string& locale) {
		RecoveryUI::Init(locale);

		if (gr_init() == -1) {
		if (!InitGraphics()) {
		return false;
		}