diff --git a/bootctrl/1.2/BootControl.cpp b/bootctrl/1.2/BootControl.cpp index ff02013..54764a0 100644 --- a/bootctrl/1.2/BootControl.cpp +++ b/bootctrl/1.2/BootControl.cpp @@ -19,6 +19,7 @@ #include "BootControl.h" #include +#include #include #include #include @@ -254,16 +255,15 @@ static bool blowAR_gs101() { } static bool blowAR() { - char platform[PROPERTY_VALUE_MAX]; - property_get("ro.boot.hardware.platform", platform, ""); + const auto& platform = ::android::base::GetProperty("ro.boot.hardware.platform", ""); - if (std::string(platform) == "gs101") { + if (platform == "gs101") { return blowAR_gs101(); - } else if (std::string(platform) == "gs201" || std::string(platform) == "zuma") { + } else if (platform == "gs201" || platform == "zuma" || platform == "zumapro") { return blowAR_zuma(); } - return true; + return false; } } // namespace diff --git a/bootctrl/aidl/BootControl.cpp b/bootctrl/aidl/BootControl.cpp index e771845..83deb72 100644 --- a/bootctrl/aidl/BootControl.cpp +++ b/bootctrl/aidl/BootControl.cpp @@ -20,6 +20,7 @@ #include #include +#include #include #include #include @@ -251,16 +252,15 @@ static bool blowAR_gs101() { } static bool blowAR() { - char platform[PROPERTY_VALUE_MAX]; - property_get("ro.boot.hardware.platform", platform, ""); + const auto& platform = ::android::base::GetProperty("ro.boot.hardware.platform", ""); - if (std::string(platform) == "gs101") { + if (platform == "gs101") { return blowAR_gs101(); - } else if (std::string(platform) == "gs201" || std::string(platform) == "zuma") { + } else if (platform == "gs201" || platform == "zuma" || platform == "zumapro") { return blowAR_zuma(); } - return true; + return false; } static constexpr MergeStatus ToAIDLMergeStatus(HIDLMergeStatus status) {