commit c0bef961e41856ae4645fde32c5a2fb91f44d871
author Mark Salyzyn <salyzyn@google.com> Mon May 06 08:38:56 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 06 08:38:56 2019 -0700
tree 0c93b7c0d07955f47352ed5c38ed156879b7ca2a
parent 4666dc0b03372d08df422ea43f8c175124ebff8b
parent 65452202ddfe470657166a57eaaabb61c5e36f4e

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

Change-Id: Icb7f4cd3c20af1f80fa3ca2b05b906b38111b1e2

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;