summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2019-12-09 23:38:57 +0100
committerandroid-build-merger <android-build-merger@google.com>2019-12-09 23:38:57 +0100
commit1c194f2a81760e651c819d9a91d7e027c699df31 (patch)
tree19fe3572bd2f59e65cb8ca8d04693c5ba12229cd
parentMerge "Add mechanism for device-specific loop images" am: d81bb36b5b (diff)
parentMerge "Revert "Add mechanism for device-specific loop images"" (diff)
downloadandroid_bootable_recovery-1c194f2a81760e651c819d9a91d7e027c699df31.tar
android_bootable_recovery-1c194f2a81760e651c819d9a91d7e027c699df31.tar.gz
android_bootable_recovery-1c194f2a81760e651c819d9a91d7e027c699df31.tar.bz2
android_bootable_recovery-1c194f2a81760e651c819d9a91d7e027c699df31.tar.lz
android_bootable_recovery-1c194f2a81760e651c819d9a91d7e027c699df31.tar.xz
android_bootable_recovery-1c194f2a81760e651c819d9a91d7e027c699df31.tar.zst
android_bootable_recovery-1c194f2a81760e651c819d9a91d7e027c699df31.zip
-rw-r--r--recovery_ui/screen_ui.cpp14
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();