diff options
author | Tianjie Xu <xunchang@google.com> | 2019-12-09 23:41:30 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-12-09 23:41:30 +0100 |
commit | f552eceec159a7d0964680d36f83158d2332b702 (patch) | |
tree | 2b50529c5343a281f6c8d74a62b34bde6cd720be | |
parent | Merge "Add mechanism for device-specific loop images" am: d81bb36b5b am: 5446037552 (diff) | |
parent | Merge "Revert "Add mechanism for device-specific loop images"" am: fff38d9446 (diff) | |
download | android_bootable_recovery-f552eceec159a7d0964680d36f83158d2332b702.tar android_bootable_recovery-f552eceec159a7d0964680d36f83158d2332b702.tar.gz android_bootable_recovery-f552eceec159a7d0964680d36f83158d2332b702.tar.bz2 android_bootable_recovery-f552eceec159a7d0964680d36f83158d2332b702.tar.lz android_bootable_recovery-f552eceec159a7d0964680d36f83158d2332b702.tar.xz android_bootable_recovery-f552eceec159a7d0964680d36f83158d2332b702.tar.zst android_bootable_recovery-f552eceec159a7d0964680d36f83158d2332b702.zip |
-rw-r--r-- | recovery_ui/screen_ui.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/recovery_ui/screen_ui.cpp b/recovery_ui/screen_ui.cpp index b3ef113a7..087fc0e84 100644 --- a/recovery_ui/screen_ui.cpp +++ b/recovery_ui/screen_ui.cpp @@ -941,27 +941,17 @@ void ScreenRecoveryUI::LoadAnimation() { closedir); dirent* de; std::vector<std::string> intro_frame_names; - std::vector<std::string> default_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"; + std::vector<std::string> loop_frame_names; while ((de = readdir(dir.get())) != nullptr) { int value, num_chars; if (sscanf(de->d_name, "intro%d%n.png", &value, &num_chars) == 1) { intro_frame_names.emplace_back(de->d_name, num_chars); } 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); - } else if (sscanf(de->d_name, deviceformat.c_str(), &value, &num_chars) == 1) { - device_loop_frame_names.emplace_back(de->d_name, num_chars); + 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 loop_frames = loop_frame_names.size(); |