firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverts "[Impeller] disable AHBs on devices that were upgraded to 29. (#56202)" (flutter/engine#56212)

Browse Source 
Reverts: flutter/engine#56202
Initiated by: jonahwilliams
Reason for reverting: tests didn't actually run.
Original PR Author: jonahwilliams

Reviewed By: {chinmaygarde, jtmcdole}

This change reverts the following previous change:
Uses `ro.product.first_api_level` to disable AHBs on devices that began life pre 29.

Fixes https://github.com/flutter/flutter/issues/157113
This commit is contained in:
auto-submit[bot] 2024-10-29 17:45:47 +00:00 committed by GitHub
parent d0141e3ee3
commit bc43093cdd
3 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine/src/flutter/impeller/toolkit/android/shadow_realm.cc
View File

@ -15,23 +15,13 @@ bool ShadowRealm::ShouldDisableAHB() {
__system_property_get("ro.com.google.clientidbase", clientidbase); __system_property_get("ro.com.google.clientidbase", clientidbase);
auto api_level = android_get_device_api_level(); auto api_level = android_get_device_api_level();
char first_api_level[PROP_VALUE_MAX];
__system_property_get("ro.product.first_api_level", first_api_level);
return ShouldDisableAHBInternal(clientidbase, first_api_level, api_level); return ShouldDisableAHBInternal(clientidbase, api_level);
} }
// static // static
bool ShadowRealm::ShouldDisableAHBInternal(std::string_view clientidbase, bool ShadowRealm::ShouldDisableAHBInternal(std::string_view clientidbase,
std::string_view first_api_level,
uint32_t api_level) { uint32_t api_level) {
// Most devices that have updated to API 29 don't seem to correctly
// support AHBs: https://github.com/flutter/flutter/issues/157113
if (first_api_level == "28" || first_api_level == "27" ||
first_api_level == "26" || first_api_level == "25" ||
first_api_level == "24") {
return false;
}
// From local testing, neither the swapchain nor AHB import works, see also: // From local testing, neither the swapchain nor AHB import works, see also:
// https://github.com/flutter/flutter/issues/154068 // https://github.com/flutter/flutter/issues/154068
if (clientidbase == kAndroidHuawei && api_level <= 29) { if (clientidbase == kAndroidHuawei && api_level <= 29) {

1
engine/src/flutter/impeller/toolkit/android/shadow_realm.h
View File

@ -18,7 +18,6 @@ class ShadowRealm {
// For testing. // For testing.
static bool ShouldDisableAHBInternal(std::string_view clientidbase, static bool ShouldDisableAHBInternal(std::string_view clientidbase,
std::string_view first_api_level,
uint32_t api_level); uint32_t api_level);
}; };

14
engine/src/flutter/impeller/toolkit/android/toolkit_android_unittests.cc
View File

@ -138,17 +138,9 @@ TEST(ToolkitAndroidTest, CanPostAndWaitForFrameCallbacks) {
TEST(ToolkitAndroidTest, ShouldDisableAHB) { TEST(ToolkitAndroidTest, ShouldDisableAHB) {
EXPECT_FALSE(ShadowRealm::ShouldDisableAHB()); EXPECT_FALSE(ShadowRealm::ShouldDisableAHB());
EXPECT_FALSE( EXPECT_TRUE(ShadowRealm::ShouldDisableAHBInternal("android-huawei", 29));
ShadowRealm::ShouldDisableAHBInternal("android-huawei", "30", 30)); EXPECT_FALSE(ShadowRealm::ShouldDisableAHBInternal("android-huawei", 30));
EXPECT_FALSE( EXPECT_FALSE(ShadowRealm::ShouldDisableAHBInternal("something made up", 29));
ShadowRealm::ShouldDisableAHBInternal("something made up", "29", 29));
EXPECT_TRUE(
ShadowRealm::ShouldDisableAHBInternal("android-huawei", "29", 29));
EXPECT_TRUE(
ShadowRealm::ShouldDisableAHBInternal("something made up", "27", 29));
EXPECT_TRUE(
ShadowRealm::ShouldDisableAHBInternal("android-huawei", "garbage", 29));
} }
} // namespace impeller::android::testing } // namespace impeller::android::testing