commit 65452202ddfe470657166a57eaaabb61c5e36f4e
author Mark Salyzyn <salyzyn@google.com> Mon May 06 08:22:38 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 06 08:22:38 2019 -0700
tree d430d9b0275befeed69241dabf80ce58d426cf4a
parent 2b5bd57ac499335cea93b479f9ffd191a8a70805
parent 0ec2dbd695b29909d2653e98733cce1f4a77e031

Merge "adb: enable/disable verity expected overlayfs errors."
am: be9c2c0310

Change-Id: If390a592e5d314b31173c5af2b1103ca4d80f1bc

adb/daemon/set_verity_enable_state_service.cpp

diff --git a/adb/daemon/set_verity_enable_state_service.cpp b/adb/daemon/set_verity_enable_state_service.cpp
index 889229f..49dce66 100644
--- a/adb/daemon/set_verity_enable_state_service.cpp
+++ b/adb/daemon/set_verity_enable_state_service.cpp
@@ -111,8 +111,11 @@
             WriteFdFmt(fd, "%s overlayfs for %s\n", enable ? "disabling" : "using", mount_point);
         }
     } else if (errno) {
-        WriteFdFmt(fd, "Overlayfs %s for %s failed with error %s\n", enable ? "teardown" : "setup",
-                   mount_point, strerror(errno));
+        int expected_errno = enable ? EBUSY : ENOENT;
+        if (errno != expected_errno) {
+            WriteFdFmt(fd, "Overlayfs %s for %s failed with error %s\n",
+                       enable ? "teardown" : "setup", mount_point, strerror(errno));
+        }
     }
     WriteFdFmt(fd, "Verity %s on %s\n", enable ? "enabled" : "disabled", mount_point);
     return true;