Merge "Add more privacy tags." into pi-dev (0246723a) · Commits · e / os / android_frameworks_base

core/proto/android/os/system_properties.proto

+2 −0

Original line number	Diff line number	Diff line
		@@ -192,6 +192,8 @@ message SystemPropertiesProto {
		optional string libc_debug_malloc_program = 15;

		message Log {
		option (android.msg_privacy).dest = DEST_AUTOMATIC;

		optional string tag_WifiHAL = 1;
		optional string tag_stats_log = 2;

+1 −3

Original line number	Diff line number	Diff line
		@@ -527,9 +527,7 @@ message JobStatusShortInfoProto {
		optional int32 calling_uid = 1;
		// Job IDs can technically be negative.
		optional int32 job_id = 2;
		optional string battery_name = 3 [
		(.android.privacy).dest = DEST_EXPLICIT
		];
		optional string battery_name = 3;
		}

		// Dump from a com.android.server.job.controllers.JobStatus object.

+4 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ message UsbAccessoryProto {
		optional string model = 2;
		optional string description = 3;
		optional string version = 4;
		optional string uri = 5;
		optional string uri = 5 [ (android.privacy).dest = DEST_EXPLICIT ];
		optional string serial = 6 [ (android.privacy).dest = DEST_EXPLICIT ];
		}

		@@ -155,6 +155,7 @@ message UsbEndPointProto {
		message UsbConnectionRecordProto {
		option (android.msg_privacy).dest = DEST_AUTOMATIC;

		// usb device's address, e.g. 001/002, nothing about the phone
		optional string device_address = 1;
		optional android.service.UsbConnectionRecordMode mode = 2;
		optional int64 timestamp = 3;
		@@ -251,6 +252,7 @@ message UsbAlsaDeviceProto {
		optional string name = 3;
		optional bool has_playback = 4;
		optional bool has_capture = 5;
		// usb device's address, e.g. 001/002, nothing about the phone
		optional string address = 6;
		}

		@@ -259,6 +261,7 @@ message UsbMidiDeviceProto {

		optional int32 card = 1;
		optional int32 device = 2;
		// usb device's address, e.g. 001/002, nothing about the phone
		optional string device_address = 3;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,5 +29,5 @@ message DisplayInfoProto {
		optional int32 logical_height = 2;
		optional int32 app_width = 3;
		optional int32 app_height = 4;
		optional string name = 5;
		optional string name = 5 [ (.android.privacy).dest = DEST_EXPLICIT ];
		}