PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Add mechanism for device-specific loop images""

Browse Source 
am: fff38d9446

Change-Id: Ia86a156bbb90c39edf470b04892842bb27251348
This commit is contained in:
Tianjie Xu
2019-12-09 14:36:27 -08:00
committed by android-build-merger
parent 5446037552 fff38d9446
commit df59e19ca3
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
recovery_ui/screen_ui.cpp
View File

@@ -941,27 +941,17 @@ void ScreenRecoveryUI::LoadAnimation() {
closedir); closedir);
dirent* de; dirent* de;
std::vector<std::string> intro_frame_names; std::vector<std::string> intro_frame_names;
std::vector<std::string> default_loop_frame_names; std::vector<std::string> loop_frame_names;
std::vector<std::string> device_loop_frame_names;
// Create string format for device-specific loop animations.
std::string deviceformat = android::base::GetProperty("ro.product.product.name", "");
deviceformat += "%d%n.png";
while ((de = readdir(dir.get())) != nullptr) { while ((de = readdir(dir.get())) != nullptr) {
int value, num_chars; int value, num_chars;
if (sscanf(de->d_name, "intro%d%n.png", &value, &num_chars) == 1) { if (sscanf(de->d_name, "intro%d%n.png", &value, &num_chars) == 1) {
intro_frame_names.emplace_back(de->d_name, num_chars); intro_frame_names.emplace_back(de->d_name, num_chars);
} else if (sscanf(de->d_name, "loop%d%n.png", &value, &num_chars) == 1) { } else if (sscanf(de->d_name, "loop%d%n.png", &value, &num_chars) == 1) {
default_loop_frame_names.emplace_back(de->d_name, num_chars); loop_frame_names.emplace_back(de->d_name, num_chars);
} else if (sscanf(de->d_name, deviceformat.c_str(), &value, &num_chars) == 1) {
device_loop_frame_names.emplace_back(de->d_name, num_chars);
} }
} }
// Favor device-specific loop frames, if they exist.
auto& loop_frame_names =
device_loop_frame_names.empty() ? default_loop_frame_names : device_loop_frame_names;
size_t intro_frames = intro_frame_names.size(); size_t intro_frames = intro_frame_names.size();
size_t loop_frames = loop_frame_names.size(); size_t loop_frames = loop_frame_names.size();