commit 7c44a4e824ecde18cfe84f6c116b11600a13a79e
author Luis Hector Chavez <lhchavez@google.com> Mon Jul 23 12:06:40 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 23 12:06:40 2018 -0700
tree ba562d1f8d017a8474f1d59cf5c857df7ce4f9c1
parent bcbf00f79787a0d9ad7fef9b842267adc355ad03
parent 778cec205af215deed88393c45ec21fc26ae2436

Merge "adb: Fix `adb remount`"
am: a54c293822

Change-Id: I09b604d98784c56af74d771def395127af45a40d

adb/daemon/remount_service.cpp

diff --git a/adb/daemon/remount_service.cpp b/adb/daemon/remount_service.cpp
index dfdc365..1bb2fbb 100644
--- a/adb/daemon/remount_service.cpp
+++ b/adb/daemon/remount_service.cpp
@@ -178,10 +178,6 @@
     }
 
     unsigned long remount_flags = get_mount_flags(fd, dir);
-    if ((remount_flags & MS_RDONLY) == 0) {
-        // Mount is already writable.
-        return true;
-    }
     remount_flags &= ~MS_RDONLY;
     remount_flags |= MS_REMOUNT;
 
@@ -192,7 +188,7 @@
         WriteFdFmt(fd, "remount of the %s mount failed: %s.\n", dir, strerror(errno));
         return false;
     }
-    if (mount(dev.c_str(), dir, "none", remount_flags, nullptr) == -1) {
+    if (mount(dev.c_str(), dir, "none", MS_REMOUNT, nullptr) == -1) {
         WriteFdFmt(fd, "remount of the %s superblock failed: %s\n", dir, strerror(errno));
         return false;
     }