tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "adb: Fix adb remount"

Browse source 
am: a54c293822

Change-Id: I09b604d98784c56af74d771def395127af45a40d
This commit is contained in:
Luis Hector Chavez 2018-07-23 12:06:40 -07:00 committed by android-build-merger
commit 9cd253c852
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adb/daemon/remount_service.cpp
View file

@ -178,10 +178,6 @@ static bool remount_partition(int fd, const char* dir) {
}
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 @@ static bool remount_partition(int fd, const char* dir) {
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;
}