From: Ajay Panicker <apanicke@google.com>
Date: Fri, 23 Sep 2016 23:43:29 +0000 (-0700)
Subject: Merge commit 'bc06c07ee7677168d71a9c809a8960f39340ff99' into blah
X-Git-Tag: android-x86-8.1-r1~377^2~288
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=496548f7841cb03dafc33d9c1c187d53dc9c5eee;p=android-x86%2Fframeworks-native.git

Merge commit 'bc06c07ee7677168d71a9c809a8960f39340ff99' into blah

Change-Id: I6cbd56cd2ee42de56736642e617689c412056e42
---

496548f7841cb03dafc33d9c1c187d53dc9c5eee
diff --cc cmds/dumpstate/utils.cpp
index cad7809123,5527b24161..0d9cce28bb
--- a/cmds/dumpstate/utils.cpp
+++ b/cmds/dumpstate/utils.cpp
@@@ -828,7 -828,8 +828,8 @@@ bool drop_root_user() 
      }
  
      gid_t groups[] = { AID_LOG, AID_SDCARD_R, AID_SDCARD_RW,
-             AID_MOUNT, AID_INET, AID_NET_BW_STATS, AID_READPROC, AID_WAKELOCK };
 -            AID_MOUNT, AID_INET, AID_NET_BW_STATS, AID_READPROC,
++            AID_MOUNT, AID_INET, AID_NET_BW_STATS, AID_READPROC, AID_WAKELOCK,
+             AID_BLUETOOTH };
      if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) {
          MYLOGE("Unable to setgroups, aborting: %s\n", strerror(errno));
          return false;