commit 895623e5cafc35450bc6cef5f6d4ca7195c6b08c
author Nick Kralevich <nnk@google.com> Thu Feb 26 00:28:42 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 26 00:28:43 2015 +0000
tree b50ad9f45154bfd9568fe599fcfcdbd5f9ccea20
parent 7bb72b73b0291636721d83a45adad175163361ec
parent 268eb4f3846d551c73eb4fc5a505f9a70d47b638

Merge "check if uid=0 before attempting remount"

adb/remount_service.c

diff --git a/adb/remount_service.c b/adb/remount_service.c
index 2fe05c3..414b316 100644
--- a/adb/remount_service.c
+++ b/adb/remount_service.c
@@ -113,6 +113,12 @@
     char buffer[200];
     char prop_buf[PROPERTY_VALUE_MAX];
 
+    if (getuid() != 0) {
+        WriteStringFully(fd, "Not running as root. Try \"adb root\" first.\n");
+        adb_close(fd);
+        return;
+    }
+
     bool system_verified = false, vendor_verified = false;
     property_get("partition.system.verified", prop_buf, "0");
     if (!strcmp(prop_buf, "1")) {