Piteball
/
android_device_samsung_msm8976-common
mirror of https://github.com/team-infusion-developers/android_device_samsung_msm8976-common.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "msm8976-common: recovery: Update for O" 

This reverts commit 938eecdcc6.
This commit is contained in:
ripee 2020-04-02 00:07:21 +02:00
parent 79191485fc
commit 1d1da97260
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
recovery/Android.mk
View File

@ -1,8 +1,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_C_INCLUDES := $(call project-path-for,recovery) \
$(call project-path-for,recovery)/updater/include
LOCAL_C_INCLUDES := $(call project-path-for,recovery)
LOCAL_SRC_FILES := recovery_updater.cpp
LOCAL_MODULE := librecovery_updater_samsung
LOCAL_MODULE_TAGS := eng

26
recovery/recovery_updater.cpp
View File

@ -157,10 +157,9 @@ err_ret:
}
/* verify_trustzone("TZ_VERSION", "TZ_VERSION", ...) */
Value * VerifyTrustZoneFn(const char *name, State *state,
const std::vector<std::unique_ptr<Expr>>& argv) {
Value * VerifyTrustZoneFn(const char *name, State *state, int argc, Expr *argv[]) {
char current_tz_version[TZ_VER_BUF_LEN];
int ret;
int i, ret;
ret = get_tz_version(current_tz_version, TZ_VER_BUF_LEN);
if (ret) {
@ -168,20 +167,27 @@ Value * VerifyTrustZoneFn(const char *name, State *state,
name, ret);
}
std::vector<std::string> args;
if (!ReadArgs(state, argv, &args)) {
char** tz_version = ReadVarArgs(state, argc, argv);
if (tz_version == NULL) {
return ErrorAbort(state, kArgsParsingFailure, "%s() error parsing arguments", name);
}
for (auto& tz_version : args) {
ret = 0;
for (i = 0; i < argc; i++) {
uiPrintf(state, "Comparing TZ version %s to %s",
tz_version.c_str(), current_tz_version);
if (strncmp(tz_version.c_str(), current_tz_version, tz_version.length()) == 0) {
return StringValue(strdup("1"));
tz_version[i], current_tz_version);
if (strncmp(tz_version[i], current_tz_version, strlen(tz_version[i])) == 0) {
ret = 1;
break;
}
}
return StringValue(strdup("0"));
for (i = 0; i < argc; i++) {
free(tz_version[i]);
}
free(tz_version);
return StringValue(strdup(ret ? "1" : "0"));
}
void Register_librecovery_updater_samsung() {