Merge commit 'goog/master' into merge_master (bfa833c0) · Commits · e / os / android_system_core

include/private/android_filesystem_config.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@
		#define AID_NET_BT 3002 /* bluetooth: create sco, rfcomm or l2cap sockets */
		#define AID_INET 3003 /* can create AF_INET and AF_INET6 sockets */
		#define AID_NET_RAW 3004 /* can create raw INET sockets */
		#define AID_NET_ADMIN 3005 /* can configure interfaces and routing tables. */

		#define AID_MISC 9998 /* access to misc storage */
		#define AID_NOBODY 9999
		@@ -101,6 +102,7 @@ static struct android_id_info android_ids[] = {
		{ "keystore", AID_KEYSTORE, },
		{ "inet", AID_INET, },
		{ "net_raw", AID_NET_RAW, },
		{ "net_admin", AID_NET_ADMIN, },
		{ "misc", AID_MISC, },
		{ "nobody", AID_NOBODY, },
		};
		@@ -135,7 +137,7 @@ static struct fs_path_config android_dirs[] = {
		{ 00750, AID_ROOT, AID_SHELL, "sbin" },
		{ 00755, AID_ROOT, AID_SHELL, "system/bin" },
		{ 00755, AID_ROOT, AID_SHELL, "system/xbin" },
		{ 00777, AID_ROOT, AID_ROOT, "system/etc/ppp" }, /* REMOVE */
		{ 00755, AID_ROOT, AID_ROOT, "system/etc/ppp" },
		{ 00777, AID_ROOT, AID_ROOT, "sdcard" },
		{ 00755, AID_ROOT, AID_ROOT, 0 },
		};
		@@ -147,20 +149,18 @@ static struct fs_path_config android_dirs[] = {
		** and will allow partial matches.
		*/
		static struct fs_path_config android_files[] = {
		{ 00555, AID_ROOT, AID_ROOT, "system/etc/ppp/ip-up" },
		{ 00555, AID_ROOT, AID_ROOT, "system/etc/ppp/ip-down" },
		{ 00440, AID_ROOT, AID_SHELL, "system/etc/init.goldfish.rc" },
		{ 00550, AID_ROOT, AID_SHELL, "system/etc/init.goldfish.sh" },
		{ 00440, AID_ROOT, AID_SHELL, "system/etc/init.trout.rc" },
		{ 00550, AID_ROOT, AID_SHELL, "system/etc/init.ril" },
		{ 00550, AID_ROOT, AID_SHELL, "system/etc/init.testmenu" },
		{ 00550, AID_ROOT, AID_SHELL, "system/etc/init.gprs-pppd" },
		{ 00550, AID_DHCP, AID_SHELL, "system/etc/dhcpcd/dhcpcd-run-hooks" },
		{ 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/dbus.conf" },
		{ 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/bluez/main.conf" },
		{ 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/bluez/input.conf" },
		{ 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/bluez/audio.conf" },
		{ 00440, AID_RADIO, AID_AUDIO, "/system/etc/AudioPara4.csv" },
		{ 00440, AID_RADIO, AID_AUDIO, "system/etc/AudioPara4.csv" },
		{ 00555, AID_ROOT, AID_ROOT, "system/etc/ppp/*" },
		{ 00644, AID_SYSTEM, AID_SYSTEM, "data/app/*" },
		{ 00644, AID_SYSTEM, AID_SYSTEM, "data/app-private/*" },
		{ 00644, AID_APP, AID_APP, "data/data/*" },

init/builtins.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ static int write_file(const char path, const char value)
		fd = open(path, O_WRONLY\|O_CREAT, 0622);

		if (fd < 0)
		return -1;
		return -errno;

		len = strlen(value);

		@@ -59,7 +59,7 @@ static int write_file(const char path, const char value)

		close(fd);
		if (ret < 0) {
		return -1;
		return -errno;
		} else {
		return 0;
		}

init/devices.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -118,6 +118,9 @@ static struct perms_ devperms[] = {
		{ "/dev/msm_camera/", 0660, AID_SYSTEM, AID_SYSTEM, 1 },
		{ "/dev/akm8976_daemon",0640, AID_COMPASS, AID_SYSTEM, 0 },
		{ "/dev/akm8976_aot", 0640, AID_COMPASS, AID_SYSTEM, 0 },
		{ "/dev/akm8973_daemon",0640, AID_COMPASS, AID_SYSTEM, 0 },
		{ "/dev/akm8973_aot", 0640, AID_COMPASS, AID_SYSTEM, 0 },
		{ "/dev/bma150", 0640, AID_COMPASS, AID_SYSTEM, 0 },
		{ "/dev/akm8976_pffd", 0640, AID_COMPASS, AID_SYSTEM, 0 },
		{ "/dev/msm_pcm_out", 0660, AID_SYSTEM, AID_AUDIO, 1 },
		{ "/dev/msm_pcm_in", 0660, AID_SYSTEM, AID_AUDIO, 1 },
		@@ -137,6 +140,7 @@ static struct perms_ devperms[] = {
		{ "/dev/qmi2", 0640, AID_RADIO, AID_RADIO, 0 },
		/* CDMA radio interface MUX */
		{ "/dev/ts0710mux", 0640, AID_RADIO, AID_RADIO, 1 },
		{ "/dev/ppp", 0660, AID_RADIO, AID_VPN, 0 },
		{ "/dev/tun", 0640, AID_VPN, AID_VPN, 0 },
		{ NULL, 0, 0, 0, 0 },
		};

init/property_service.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,8 @@ struct {
		{ "wlan.", AID_SYSTEM },
		{ "dhcp.", AID_SYSTEM },
		{ "dhcp.", AID_DHCP },
		{ "vpn.", AID_SYSTEM },
		{ "vpn.", AID_VPN },
		{ "debug.", AID_SHELL },
		{ "log.", AID_SHELL },
		{ "service.adb.root", AID_SHELL },

libacc/acc.cpp

+780 −539

File changed.

Preview size limit exceeded, changes collapsed.