Evolution-X-Tensor/device_google_gs-common
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support AR one-shot fuse on the new platform

Browse source 
Bug: 351059371
Flag: EXEMPT bugfix
Change-Id: I14faf995aa259b607300616ba1a1ea6d24a92d2a
Signed-off-by: Steven Tsai <steventsai@google.com>
This commit is contained in:
Steven Tsai 2024-07-04 20:08:40 +08:00
parent 90ea9b5fca
commit c984d655c2
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bootctrl/1.2/BootControl.cpp
View file

@ -19,6 +19,7 @@
#include "BootControl.h" #include "BootControl.h"
#include <android-base/file.h> #include <android-base/file.h>
#include <android-base/properties.h>
#include <android-base/unique_fd.h> #include <android-base/unique_fd.h>
#include <bootloader_message/bootloader_message.h> #include <bootloader_message/bootloader_message.h>
#include <cutils/properties.h> #include <cutils/properties.h>
@ -254,16 +255,15 @@ static bool blowAR_gs101() {
} }
static bool blowAR() { static bool blowAR() {
char platform[PROPERTY_VALUE_MAX]; const auto& platform = ::android::base::GetProperty("ro.boot.hardware.platform", "");
property_get("ro.boot.hardware.platform", platform, "");
if (std::string(platform) == "gs101") { if (platform == "gs101") {
return blowAR_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 blowAR_zuma();
} }
return true; return false;
} }
} // namespace } // namespace

10
bootctrl/aidl/BootControl.cpp
View file

@ -20,6 +20,7 @@
#include <android-base/file.h> #include <android-base/file.h>
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android-base/properties.h>
#include <android-base/unique_fd.h> #include <android-base/unique_fd.h>
#include <bootloader_message/bootloader_message.h> #include <bootloader_message/bootloader_message.h>
#include <cutils/properties.h> #include <cutils/properties.h>
@ -251,16 +252,15 @@ static bool blowAR_gs101() {
} }
static bool blowAR() { static bool blowAR() {
char platform[PROPERTY_VALUE_MAX]; const auto& platform = ::android::base::GetProperty("ro.boot.hardware.platform", "");
property_get("ro.boot.hardware.platform", platform, "");
if (std::string(platform) == "gs101") { if (platform == "gs101") {
return blowAR_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 blowAR_zuma();
} }
return true; return false;
} }
static constexpr MergeStatus ToAIDLMergeStatus(HIDLMergeStatus status) { static constexpr MergeStatus ToAIDLMergeStatus(HIDLMergeStatus status) {