tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "recovery: fastbootd: retry opening graphics" am: 082bea6325 am: 0608d71169

Browse source 
Change-Id: I844355f11554eb5d4283cf1cb7e57889ffaff957
This commit is contained in:
Treehugger Robot 2020-05-19 13:36:47 +00:00 committed by Automerger Merge Worker
commit 5e7b0704e4
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
recovery_ui/screen_ui.cpp
View file

@ -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;
}