aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-03-08 18:31:20 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-08 18:31:20 -0800
commit6ff1bee167234aeb5281ac1a0acc6ce0720bedd1 (patch)
tree27d8c5f20c84a8dfd9d804353f88371f1a438edf
parentfcb4553dbbd0fa01f9381069acb6533d4e7b6434 (diff)
parent50458cf76ea7b0b03598c785acb1481ed0ae5b1d (diff)
downloadsystem_core-6ff1bee167234aeb5281ac1a0acc6ce0720bedd1.tar.gz
system_core-6ff1bee167234aeb5281ac1a0acc6ce0720bedd1.tar.bz2
system_core-6ff1bee167234aeb5281ac1a0acc6ce0720bedd1.zip
Merge "Add AID_SDCARD_R."
-rw-r--r--adb/adb.c5
-rw-r--r--include/private/android_filesystem_config.h1
2 files changed, 4 insertions, 2 deletions
diff --git a/adb/adb.c b/adb/adb.c
index 60568f55..001fae14 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -976,13 +976,14 @@ int adb_main(int is_daemon, int server_port)
** AID_INET to diagnose network issues (netcfg, ping)
** AID_GRAPHICS to access the frame buffer
** AID_NET_BT and AID_NET_BT_ADMIN to diagnose bluetooth (hcidump)
+ ** AID_SDCARD_R to allow reading from the SD card
** AID_SDCARD_RW to allow writing to the SD card
** AID_MOUNT to allow unmounting the SD card before rebooting
** AID_NET_BW_STATS to read out qtaguid statistics
*/
gid_t groups[] = { AID_ADB, AID_LOG, AID_INPUT, AID_INET, AID_GRAPHICS,
- AID_NET_BT, AID_NET_BT_ADMIN, AID_SDCARD_RW, AID_MOUNT,
- AID_NET_BW_STATS };
+ AID_NET_BT, AID_NET_BT_ADMIN, AID_SDCARD_R, AID_SDCARD_RW,
+ AID_MOUNT, AID_NET_BW_STATS };
if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) {
exit(1);
}
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 0344b5c8..a3d5e627 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -61,6 +61,7 @@
#define AID_UNUSED2 1025 /* deprecated, DO NOT USE */
#define AID_DRMRPC 1026 /* group for drm rpc */
#define AID_NFC 1027 /* nfc subsystem */
+#define AID_SDCARD_R 1028 /* external storage read access */
#define AID_SHELL 2000 /* adb and debug shell user */
#define AID_CACHE 2001 /* cache access */