openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "fs_mgr_avb: fix return value check of fs_mgr_get_boot_config()" am: 51da2aaa36 am: eb0a5e7e26 

am: 07fb5bf7f0

Change-Id: I6d4888f2c376f9d7f24f592bb1c4898a3ea04fb8
This commit is contained in:
Bowgo Tsai 2017-03-27 17:19:56 +00:00 committed by android-build-merger
parent 0bc3add41b 07fb5bf7f0
commit 3286a6fe73
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs_mgr/fs_mgr_avb.cpp
View File

@ -454,12 +454,12 @@ static bool init_is_avb_used() {
// be returned when there is an error.
std::string hash_alg;
if (fs_mgr_get_boot_config("vbmeta.hash_alg", &hash_alg) == 0) {
if (hash_alg == "sha256" || hash_alg == "sha512") {
return true;
}
if (!fs_mgr_get_boot_config("vbmeta.hash_alg", &hash_alg)) {
return false;
}
if (hash_alg == "sha256" || hash_alg == "sha512") {
return true;
}
return false;
}