Merge "make incidentd run in its own uid under log group for reading logs." (7a2c9d98) · Commits · e / os / android_frameworks_base

cmds/incidentd/incidentd.rc

+2 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,8 @@

		service incidentd /system/bin/incidentd
		class main
		user incidentd
		group incidentd log

		on post-fs-data
		# Create directory for incidentd

core/proto/android/os/system_properties.proto

+15 −6

Original line number	Diff line number	Diff line
		@@ -228,8 +228,9 @@ message SystemPropertiesProto {
		}
		optional PmDexopt pm_dexopt = 20;

		// Read only properites on the device.
		message Ro {
		optional int32 adb_secure = 1;
		optional bool adb_secure = 1;
		optional string arch = 2;
		optional bool audio_ignore_effects = 3;
		optional bool audio_monitorRotation = 4;
		@@ -262,21 +263,29 @@ message SystemPropertiesProto {
		}
		optional Boot boot = 7;

		// boot.img's properties.
		message BootImage {
		// When the boot.img is built.
		optional string build_date = 1;
		optional int32 build_date_utc = 2;
		// UTC timestamp of build date.
		optional int64 build_date_utc = 2;
		// Android Build fingerprint of the build, e.g.
		// google/marlin/marlin:P/MASTER/android-build/dev-keys
		optional string build_fingerprint = 3;

		// Next Tag: 4
		}
		optional BootImage bootimage = 8;

		// Version of bootloader on device.
		optional string bootloader = 9;
		// Kernel bootmode, e.g. charger.
		optional string bootmode = 10;

		// Android Platform build metadata.
		message Build {
		optional string date = 1;
		optional int32 date_utc = 2;
		optional int64 date_utc = 2;
		optional string description = 3;
		optional string display_id = 4;
		optional string host = 5;
		@@ -304,7 +313,7 @@ message SystemPropertiesProto {
		}
		optional Build build = 11;

		optional int32 camera_notify_nfc = 12;
		optional bool camera_notify_nfc = 12;
		optional string carrier = 13;
		optional bool com_android_dataroaming = 14;
		optional bool com_android_prov_mobiledata = 15;
		@@ -426,7 +435,7 @@ message SystemPropertiesProto {

		message Vendor {
		optional string build_date = 1;
		optional int32 build_date_utc = 2;
		optional int64 build_date_utc = 2;
		optional string build_fingerprint = 3;
		}
		optional Vendor vendor = 41;

core/proto/android/util/log.proto

+3 −3

Original line number	Diff line number	Diff line
		@@ -57,10 +57,10 @@ message BinaryLogEntry {
		optional uint32 tag_index = 6;

		message Elem {
		// must be sync with liblog log/log.h
		// must be sync with AOSP liblog's log.h
		enum Type {
		EVENT_TYPE_LIST_STOP = 10; // '\n'
		EVENT_TYPE_UNKNOWN = 63; // '?'
		EVENT_TYPE_LIST_STOP = 10; // ascii decimal value of char '\n'
		EVENT_TYPE_UNKNOWN = 63; // ascii decimal value of char '?'

		EVENT_TYPE_INT = 0;
		EVENT_TYPE_LONG = 1;