Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6b04ade authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "adbd: fix check of `remount -R`." am: d81c4f07 am: c2553602 

am: a63ffb0d

Change-Id: I4bb75051523c3fd3c8bbd7236f12382eb0a384da
parents 3197169e a63ffb0d

adb/daemon/remount_service.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -216,7 +216,7 @@ static void reboot_for_remount(int fd, bool need_fsck) { 
}

}





void remount_service(unique_fd fd, const std::string& cmd) {

void remount_service(unique_fd fd, const std::string& cmd) {

    bool user_requested_reboot = cmd != "-R";

    bool user_requested_reboot = cmd == "-R";





    if (getuid() != 0) {

    if (getuid() != 0) {

        WriteFdExactly(fd.get(), "Not running as root. Try \"adb root\" first.\n");

        WriteFdExactly(fd.get(), "Not running as root. Try \"adb root\" first.\n");