ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: eb0a5e7e26

Change-Id: Ib6e4a659fb1b3912263ec9b32f9da24c4d1ea16c
This commit is contained in:
Bowgo Tsai 2017-03-27 17:16:55 +00:00 • committed by android-build-merger
commit 07fb5bf7f0
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;
}