Merge \\"Add UIDs for system DNS and tethering DNS\\" am: c4dc4f3fc2

am: fcf3ed51dc

Change-Id: Icaeffaa67c3cc5c2452843b92577dd7bdab01146
This commit is contained in:
Erik Kline 2016-07-08 08:51:43 +00:00 committed by android-build-merger
commit 9f31416013

View file

@ -92,6 +92,8 @@
#define AID_FIREWALL 1048 /* firewalld process */
#define AID_TRUNKS 1049 /* trunksd process (TPM daemon) */
#define AID_NVRAM 1050 /* Access-controlled NVRAM */
#define AID_DNS 1051 /* DNS resolution daemon (system: netd) */
#define AID_DNS_TETHER 1052 /* DNS resolution daemon (tether: dnsmasq) */
/* Changes to this file must be made in AOSP, *not* in internal branches. */
#define AID_SHELL 2000 /* adb and debug shell user */
@ -203,6 +205,8 @@ static const struct android_id_info android_ids[] = {
{ "firewall", AID_FIREWALL, },
{ "trunks", AID_TRUNKS, },
{ "nvram", AID_NVRAM, },
{ "dns", AID_DNS, },
{ "dns_tether", AID_DNS_TETHER, },
{ "shell", AID_SHELL, },
{ "cache", AID_CACHE, },