DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Impeller] Reland: disable AHBs on devices that were upgraded to 29. (flutter/engine#56221)

Browse Source 
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:
Jonah Williams 2024-10-31 10:42:12 -07:00 committed by GitHub
parent c7df7b1cce
commit 6eed502b8b
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,13 +15,25 @@ bool ShadowRealm::ShouldDisableAHB() {
__system_property_get("ro.com.google.clientidbase", clientidbase);
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, api_level);
return ShouldDisableAHBInternal(clientidbase, first_api_level, api_level);
}
// static
bool ShadowRealm::ShouldDisableAHBInternal(std::string_view clientidbase,
std::string_view first_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.compare("28") == 0 ||
first_api_level.compare("27") == 0 ||
first_api_level.compare("26") == 0 ||
first_api_level.compare("25") == 0 ||
first_api_level.compare("24") == 0) {
return true;
}
// From local testing, neither the swapchain nor AHB import works, see also:
// https://github.com/flutter/flutter/issues/154068
if (clientidbase == kAndroidHuawei && api_level <= 29) {

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

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

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

@ -136,11 +136,17 @@ TEST(ToolkitAndroidTest, CanPostAndWaitForFrameCallbacks) {
}
TEST(ToolkitAndroidTest, ShouldDisableAHB) {
EXPECT_FALSE(ShadowRealm::ShouldDisableAHB());
EXPECT_FALSE(
ShadowRealm::ShouldDisableAHBInternal("android-huawei", "30", 30));
EXPECT_FALSE(
ShadowRealm::ShouldDisableAHBInternal("something made up", "29", 29));
EXPECT_TRUE(ShadowRealm::ShouldDisableAHBInternal("android-huawei", 29));
EXPECT_FALSE(ShadowRealm::ShouldDisableAHBInternal("android-huawei", 30));
EXPECT_FALSE(ShadowRealm::ShouldDisableAHBInternal("something made up", 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