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

msm8976-common: recovery: Update for O 

Change-Id: I1f01837e18acd6971c0aaf410db87a54ad34afbc
This commit is contained in:
LuK1337 2017-08-25 13:37:00 +02:00
parent d5bf5103a2
commit 938eecdcc6
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
recovery/Android.mk
View File

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

26
recovery/recovery_updater.cpp
View File

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