summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Erat2015-07-20 10:26:50 -0500
committerAndroid Git Automerger2015-07-20 10:26:50 -0500
commitcca5c3f1723e414b5e1b69b01f2d8ba7a5ed75fa (patch)
tree753845567de7c177ee5e60e1e5a340b82d5db9ed /include/private/android_filesystem_config.h
parent32cfa9527136665689818399771174b5e25d32ba (diff)
parent3a8a32413615643320bb140a24ab1d77d9aea804 (diff)
downloadplatform-system-core-cca5c3f1723e414b5e1b69b01f2d8ba7a5ed75fa.tar.gz
platform-system-core-cca5c3f1723e414b5e1b69b01f2d8ba7a5ed75fa.tar.xz
platform-system-core-cca5c3f1723e414b5e1b69b01f2d8ba7a5ed75fa.zip
am 3a8a3241: am 4812f8dd: Merge "Add a "dbus" AID for running dbus-daemon."
* commit '3a8a32413615643320bb140a24ab1d77d9aea804': Add a "dbus" AID for running dbus-daemon.
Diffstat (limited to 'include/private/android_filesystem_config.h')
-rw-r--r--include/private/android_filesystem_config.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 2ed27dcac..a49da8cd4 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -77,6 +77,7 @@
77#define AID_SDCARD_ALL 1035 /* access all users external storage */ 77#define AID_SDCARD_ALL 1035 /* access all users external storage */
78#define AID_LOGD 1036 /* log daemon */ 78#define AID_LOGD 1036 /* log daemon */
79#define AID_SHARED_RELRO 1037 /* creator of shared GNU RELRO files */ 79#define AID_SHARED_RELRO 1037 /* creator of shared GNU RELRO files */
80#define AID_DBUS 1038 /* dbus-daemon IPC broker process */
80 81
81#define AID_SHELL 2000 /* adb and debug shell user */ 82#define AID_SHELL 2000 /* adb and debug shell user */
82#define AID_CACHE 2001 /* cache access */ 83#define AID_CACHE 2001 /* cache access */
@@ -168,6 +169,7 @@ static const struct android_id_info android_ids[] = {
168 { "sdcard_all", AID_SDCARD_ALL, }, 169 { "sdcard_all", AID_SDCARD_ALL, },
169 { "logd", AID_LOGD, }, 170 { "logd", AID_LOGD, },
170 { "shared_relro", AID_SHARED_RELRO, }, 171 { "shared_relro", AID_SHARED_RELRO, },
172 { "dbus", AID_DBUS, },
171 173
172 { "shell", AID_SHELL, }, 174 { "shell", AID_SHELL, },
173 { "cache", AID_CACHE, }, 175 { "cache", AID_CACHE, },