From 0836c9e38624da1f109f6438f24fada3621e6d7a Mon Sep 17 00:00:00 2001 From: Chien-Yu Chen Date: Thu, 3 Dec 2015 16:32:12 -0800 Subject: [PATCH] Sync internal<->AOSP user list. Bug: 27299198 Cherry-picked from: Restart cameraserver Bug: 24511454 Change-Id: Ia27f4ef0eb71f891c789f637a21b04afe0b1c4e9 --- include/private/android_filesystem_config.h | 2 ++ rootdir/init.zygote32_64.rc | 2 +- rootdir/init.zygote64_32.rc | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index 85d6c1931..c220a0c62 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -88,6 +88,7 @@ #define AID_WEBSERV 1044 /* webservd process */ #define AID_DEBUGGERD 1045 /* debuggerd unprivileged user */ #define AID_MEDIA_CODEC 1046 /* mediacodec process */ +#define AID_CAMERASERVER 1047 /* cameraserver process */ #define AID_SHELL 2000 /* adb and debug shell user */ #define AID_CACHE 2001 /* cache access */ @@ -194,6 +195,7 @@ static const struct android_id_info android_ids[] = { { "webserv", AID_WEBSERV }, { "debuggerd", AID_DEBUGGERD, }, { "mediacodec", AID_MEDIA_CODEC, }, + { "cameraserver", AID_CAMERASERVER, }, { "shell", AID_SHELL, }, { "cache", AID_CACHE, }, diff --git a/rootdir/init.zygote32_64.rc b/rootdir/init.zygote32_64.rc index 29bb1cf2e..4e702a154 100644 --- a/rootdir/init.zygote32_64.rc +++ b/rootdir/init.zygote32_64.rc @@ -11,4 +11,4 @@ service zygote_secondary /system/bin/app_process64 -Xzygote /system/bin --zygote class main socket zygote_secondary stream 660 root system onrestart restart zygote - writepid /dev/cpuset/foreground/tasks \ No newline at end of file + writepid /dev/cpuset/foreground/tasks diff --git a/rootdir/init.zygote64_32.rc b/rootdir/init.zygote64_32.rc index 8ed5e9ee8..692af991e 100644 --- a/rootdir/init.zygote64_32.rc +++ b/rootdir/init.zygote64_32.rc @@ -11,4 +11,4 @@ service zygote_secondary /system/bin/app_process32 -Xzygote /system/bin --zygote class main socket zygote_secondary stream 660 root system onrestart restart zygote - writepid /dev/cpuset/foreground/tasks \ No newline at end of file + writepid /dev/cpuset/foreground/tasks