Merge "allow dumpstate to work for non-root users." into gingerbread

cmds/dumpstate/dumpstate.c

@@ -216,6 +216,7 @@ int main(int argc, char *argv[]) {
         fclose(cmdline);
     }
 
+    if (getuid() == 0) {
         /* switch to non-root user and group */
         gid_t groups[] = { AID_LOG, AID_SDCARD_RW, AID_MOUNT };
         if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) {
@@ -230,6 +231,7 @@ int main(int argc, char *argv[]) {
             LOGE("Unable to setuid, aborting: %s\n", strerror(errno));
             return -1;
         }
+    }
 
     char path[PATH_MAX], tmp_path[PATH_MAX];
     pid_t gzip_pid = -1;