am 3178c83a: am 895623e5: Merge "check if uid=0 before attempting remount"

* commit '3178c83a02c7e0b1ee6f94c207f0d851f5baf7f2':
  check if uid=0 before attempting remount
This commit is contained in:
Nick Kralevich 2015-02-26 01:13:25 +00:00 committed by Android Git Automerger
commit 3e8ebad058

View file

@ -113,6 +113,12 @@ void remount_service(int fd, void *cookie)
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")) {