From 94a83be42aab908ae7f59af0f107a8036ac8c684 Mon Sep 17 00:00:00 2001 From: Joshua Lambert Date: Mon, 9 Dec 2019 20:24:18 +0000 Subject: Revert "Add mechanism for device-specific loop images" This reverts commit fd6a2c226d8babf1c77dd09efbab5473b9173c51. Reason for revert: Mechanism already exists: https://source.android.com/devices/tech/ota/nonab/device_code#recovery-ui-images Change-Id: Ic7b640b5d435cfb6f5c2610a2534405fb9415936 --- recovery_ui/screen_ui.cpp | 14 ++------------ 1 file 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 intro_frame_names; - std::vector default_loop_frame_names; - std::vector 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 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(); -- cgit v1.2.3