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

Merge "adb: checks device state when using adb disable-verity for AVB"

Browse source 
am: d5fc6bdd36

Change-Id: I030049c206492ebc980a4080804f8d3e290b6487
This commit is contained in:
Bowgo Tsai 2018-03-16 01:56:43 +00:00 • committed by android-build-merger
commit 8c91e2bfbb
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
adb/daemon/set_verity_enable_state_service.cpp
View file

@ -98,13 +98,22 @@ static std::string get_ab_suffix() {
return android::base::GetProperty("ro.boot.slot_suffix", "");
}
static bool is_avb_device_locked() {
return android::base::GetProperty("ro.boot.vbmeta.device_state", "") == "locked";
}
/* Use AVB to turn verity on/off */
static bool set_avb_verity_enabled_state(int fd, AvbOps* ops, bool enable_verity) {
std::string ab_suffix = get_ab_suffix();
bool verity_enabled;
if (is_avb_device_locked()) {
WriteFdFmt(fd, "Device is locked. Please unlock the device first\n");
return false;
}
if (!avb_user_verity_get(ops, ab_suffix.c_str(), &verity_enabled)) {
WriteFdFmt(fd, "Error getting verity state\n");
WriteFdFmt(fd, "Error getting verity state. Try adb root first?\n");
return false;
}