Tag platform protos with right privacy level.
Bug: 72407926
Test: flash and run incident -p <each section>
Change-Id: Ieb36260bb57b0d38791817d548a9e12429e88987
diff --git a/core/proto/android/app/notification.proto b/core/proto/android/app/notification.proto
index 5376b0e..379a4ae 100644
--- a/core/proto/android/app/notification.proto
+++ b/core/proto/android/app/notification.proto
@@ -18,6 +18,8 @@
option java_package = "android.app";
option java_multiple_files = true;
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
package android.app;
/**
@@ -25,13 +27,15 @@
* Deprecated fields are not included in the proto.
*/
message NotificationProto {
- optional string channel_id = 1;
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
+ optional string channel_id = 1 [ (.android.privacy).dest = DEST_EXPLICIT ];
optional bool has_ticker_text = 2;
optional int32 flags = 3;
optional int32 color = 4;
- optional string category = 5;
- optional string group_key = 6;
- optional string sort_key = 7;
+ optional string category = 5 [ (.android.privacy).dest = DEST_EXPLICIT ];
+ optional string group_key = 6 [ (.android.privacy).dest = DEST_EXPLICIT ];
+ optional string sort_key = 7 [ (.android.privacy).dest = DEST_EXPLICIT ];
optional int32 action_length = 8;
// If this field is not set, then the value is unknown.
diff --git a/core/proto/android/app/profilerinfo.proto b/core/proto/android/app/profilerinfo.proto
index ca1b935..6b28318 100644
--- a/core/proto/android/app/profilerinfo.proto
+++ b/core/proto/android/app/profilerinfo.proto
@@ -18,12 +18,16 @@
option java_package = "android.app";
option java_multiple_files = true;
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
package android.app;
/**
* An android.app.ProfilerInfo object.
*/
message ProfilerInfoProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string profile_file = 1;
optional int32 profile_fd = 2;
optional int32 sampling_interval = 3;
diff --git a/core/proto/android/content/configuration.proto b/core/proto/android/content/configuration.proto
index 111b27f..a62d56c 100644
--- a/core/proto/android/content/configuration.proto
+++ b/core/proto/android/content/configuration.proto
@@ -22,11 +22,14 @@
import "frameworks/base/core/proto/android/app/window_configuration.proto";
import "frameworks/base/core/proto/android/content/locale.proto";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
/**
* An android resource configuration.
*/
message ConfigurationProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional float font_scale = 1;
optional uint32 mcc = 2;
optional uint32 mnc = 3;
diff --git a/core/proto/android/content/featureinfo.proto b/core/proto/android/content/featureinfo.proto
index a750120..6878f0e 100644
--- a/core/proto/android/content/featureinfo.proto
+++ b/core/proto/android/content/featureinfo.proto
@@ -16,14 +16,20 @@
syntax = "proto2";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
option java_package = "android.content.pm";
option java_multiple_files = true;
package android.content.pm;
message FeatureInfoProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
+ // Some hard coded feature name
optional string name = 1;
optional int32 version = 2;
+ // String representation of reqGlEsVersion.
optional string gles_version = 3;
optional int32 flags = 4;
}
diff --git a/core/proto/android/content/intent.proto b/core/proto/android/content/intent.proto
index 3e5265a..c25b46d 100644
--- a/core/proto/android/content/intent.proto
+++ b/core/proto/android/content/intent.proto
@@ -21,9 +21,12 @@
option java_multiple_files = true;
import "frameworks/base/core/proto/android/os/patternmatcher.proto";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
// Next Tag: 13
message IntentProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
enum DockState {
// Used as an int value for Intent#EXTRA_DOCK_STATE to represent that
// the phone is not in any dock.
@@ -48,13 +51,13 @@
optional string action = 1;
repeated string categories = 2;
- optional string data = 3;
+ optional string data = 3 [ (.android.privacy).dest = DEST_EXPLICIT ];
optional string type = 4;
optional string flag = 5;
optional string package = 6;
optional string component = 7;
optional string source_bounds = 8;
- optional string clip_data = 9;
+ optional string clip_data = 9 [ (.android.privacy).dest = DEST_EXPLICIT ];
optional string extras = 10;
optional int32 content_user_hint = 11;
optional string selector = 12;
@@ -62,9 +65,11 @@
// Next Tag: 11
message IntentFilterProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
repeated string actions = 1;
repeated string categories = 2;
- repeated string data_schemes = 3;
+ repeated string data_schemes = 3 [ (.android.privacy).dest = DEST_EXPLICIT ];
repeated android.os.PatternMatcherProto data_scheme_specs = 4;
repeated AuthorityEntryProto data_authorities = 5;
repeated android.os.PatternMatcherProto data_paths = 6;
@@ -75,6 +80,8 @@
}
message AuthorityEntryProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string host = 1;
optional bool wild = 2;
optional int32 port = 3;
diff --git a/core/proto/android/content/locale.proto b/core/proto/android/content/locale.proto
index f0de31c..2be3ab9 100644
--- a/core/proto/android/content/locale.proto
+++ b/core/proto/android/content/locale.proto
@@ -18,9 +18,13 @@
option java_package = "android.content";
option java_multiple_files = true;
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
package android.content;
message LocaleProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string language = 1;
optional string country = 2;
optional string variant = 3;
diff --git a/core/proto/android/content/package_item_info.proto b/core/proto/android/content/package_item_info.proto
index 8470159..6e99bec 100644
--- a/core/proto/android/content/package_item_info.proto
+++ b/core/proto/android/content/package_item_info.proto
@@ -18,9 +18,13 @@
option java_package = "android.content.pm";
option java_multiple_files = true;
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
package android.content.pm;
message PackageItemInfoProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string name = 1;
optional string package_name = 2;
optional int32 label_res = 3;
@@ -31,6 +35,8 @@
// Proto of android.content.pm.ApplicationInfo which extends PackageItemInfo
message ApplicationInfoProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional PackageItemInfoProto package = 1;
optional string permission = 2;
optional string process_name = 3;
@@ -48,6 +54,8 @@
repeated string split_class_loader_names = 15;
message Version {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional bool enabled = 1;
optional int32 min_sdk_version = 2;
optional int32 target_sdk_version = 3;
@@ -57,6 +65,8 @@
optional Version version = 16;
message Detail {
+ option (.android.msg_privacy).dest = DEST_EXPLICIT;
+
optional string class_name = 1;
optional string task_affinity = 2;
optional int32 requires_smallest_width_dp = 3;
diff --git a/core/proto/android/graphics/point.proto b/core/proto/android/graphics/point.proto
index 5ae17cb..035b9fe 100644
--- a/core/proto/android/graphics/point.proto
+++ b/core/proto/android/graphics/point.proto
@@ -17,9 +17,13 @@
syntax = "proto2";
package android.graphics;
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
option java_multiple_files = true;
message PointProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 x = 1;
optional int32 y = 2;
}
diff --git a/core/proto/android/graphics/rect.proto b/core/proto/android/graphics/rect.proto
index 562ffce..eb403fe 100644
--- a/core/proto/android/graphics/rect.proto
+++ b/core/proto/android/graphics/rect.proto
@@ -17,9 +17,13 @@
syntax = "proto2";
package android.graphics;
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
option java_multiple_files = true;
message RectProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 left = 1;
optional int32 top = 2;
optional int32 right = 3;
diff --git a/core/proto/android/os/cpufreq.proto b/core/proto/android/os/cpufreq.proto
index a8da0bf..8481ffc 100644
--- a/core/proto/android/os/cpufreq.proto
+++ b/core/proto/android/os/cpufreq.proto
@@ -18,10 +18,13 @@
option java_multiple_files = true;
option java_outer_classname = "CpuFreqProto";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
package android.os;
// cpu frequency time from /sys/devices/system/cpu/cpufreq/all_time_in_state
message CpuFreq {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
optional int32 jiffy_hz = 1; // obtain by system config.
@@ -30,10 +33,13 @@
// frequency time pre cpu, unit in jiffy, TODO: obtain jiffies.
message CpuFreqStats {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
optional string cpu_name = 1;
message TimeInState {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 state_khz = 1; // cpu frequency
optional int64 time_jiffy = 2; // number of jiffies
}
diff --git a/core/proto/android/os/cpuinfo.proto b/core/proto/android/os/cpuinfo.proto
index cd151e2..ca43602 100644
--- a/core/proto/android/os/cpuinfo.proto
+++ b/core/proto/android/os/cpuinfo.proto
@@ -18,6 +18,8 @@
option java_multiple_files = true;
option java_outer_classname = "CpuInfoProto";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
package android.os;
/**
@@ -27,8 +29,11 @@
* Next Tag: 6
*/
message CpuInfo {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
message TaskStats {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 total = 1; // total number of cpu tasks
optional int32 running = 2; // number of running tasks
optional int32 sleeping = 3; // number of sleeping tasks
@@ -38,6 +43,8 @@
optional TaskStats task_stats = 1;
message MemStats { // unit in kB
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 total = 1;
optional int32 used = 2;
optional int32 free = 3;
@@ -48,6 +55,8 @@
optional MemStats swap = 3;
message CpuUsage { // unit is percentage %
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 cpu = 1; // 400% cpu indicates 4 cores
optional int32 user = 2;
optional int32 nice = 3;
@@ -62,9 +71,11 @@
// Next Tag: 13
message Task {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 pid = 1;
optional int32 tid = 2;
- optional string user = 3;
+ optional string user = 3; // the process name which uses cpu
optional string pr = 4; // priority of each task, using string type is because special value RT (real time)
optional sint32 ni = 5; // niceness value
optional float cpu = 6; // precentage of cpu usage of the task
diff --git a/core/proto/android/os/kernelwake.proto b/core/proto/android/os/kernelwake.proto
index 7e5be9d..c296dab 100644
--- a/core/proto/android/os/kernelwake.proto
+++ b/core/proto/android/os/kernelwake.proto
@@ -18,15 +18,21 @@
option java_multiple_files = true;
option java_outer_classname = "WakeupSourcesProto";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
package android.os;
message KernelWakeSources {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
// Kernel records of what caused the application processor to wake up
repeated WakeupSourceProto wakeup_sources = 1;
}
// Next Tag: 11
message WakeupSourceProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
// Name of the event which triggers application processor
optional string name = 1;
diff --git a/core/proto/android/os/looper.proto b/core/proto/android/os/looper.proto
index ef84bb1..435c648 100644
--- a/core/proto/android/os/looper.proto
+++ b/core/proto/android/os/looper.proto
@@ -20,9 +20,12 @@
option java_multiple_files = true;
import "frameworks/base/core/proto/android/os/messagequeue.proto";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
message LooperProto {
- optional string thread_name = 1;
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
+ optional string thread_name = 1 [ (.android.privacy).dest = DEST_EXPLICIT ];
optional int64 thread_id = 2;
optional int32 identity_hash_code = 3;
optional android.os.MessageQueueProto queue = 4;
diff --git a/core/proto/android/os/message.proto b/core/proto/android/os/message.proto
index 38e27a1..048d031 100644
--- a/core/proto/android/os/message.proto
+++ b/core/proto/android/os/message.proto
@@ -17,9 +17,12 @@
syntax = "proto2";
package android.os;
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
option java_multiple_files = true;
message MessageProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int64 when = 1;
// Name of callback class.
optional string callback = 2;
@@ -29,7 +32,7 @@
optional int32 arg1 = 4;
optional int32 arg2 = 5;
// String representation of an arbitrary object to send to the recipient.
- optional string obj = 6;
+ optional string obj = 6 [ (.android.privacy).dest = DEST_EXPLICIT ];
// Name of target class.
optional string target = 7;
optional int32 barrier = 8;
diff --git a/core/proto/android/os/messagequeue.proto b/core/proto/android/os/messagequeue.proto
index 5d4bff0..4bfcb81 100644
--- a/core/proto/android/os/messagequeue.proto
+++ b/core/proto/android/os/messagequeue.proto
@@ -20,8 +20,11 @@
option java_multiple_files = true;
import "frameworks/base/core/proto/android/os/message.proto";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
message MessageQueueProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
repeated android.os.MessageProto messages = 1;
optional bool is_polling_locked = 2;
optional bool is_quitting = 3;
diff --git a/core/proto/android/os/pagetypeinfo.proto b/core/proto/android/os/pagetypeinfo.proto
index f82ea76..b8f618b 100644
--- a/core/proto/android/os/pagetypeinfo.proto
+++ b/core/proto/android/os/pagetypeinfo.proto
@@ -18,6 +18,8 @@
option java_multiple_files = true;
option java_outer_classname = "PageTypeInfoProto";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
package android.os;
/*
@@ -36,6 +38,7 @@
* Next tag: 5
*/
message PageTypeInfo {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
optional int32 page_block_order = 1;
@@ -48,6 +51,7 @@
// Next tag: 5
message MigrateTypeProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
optional int32 node = 1;
@@ -61,6 +65,7 @@
// Next tag: 9
message BlockProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
optional int32 node = 1;
diff --git a/core/proto/android/os/patternmatcher.proto b/core/proto/android/os/patternmatcher.proto
index d30315b..520f2f5 100644
--- a/core/proto/android/os/patternmatcher.proto
+++ b/core/proto/android/os/patternmatcher.proto
@@ -16,10 +16,13 @@
syntax = "proto2";
option java_multiple_files = true;
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
package android.os;
message PatternMatcherProto {
+ option (android.msg_privacy).dest = DEST_EXPLICIT;
+
optional string pattern = 1;
enum Type {
diff --git a/core/proto/android/os/system_properties.proto b/core/proto/android/os/system_properties.proto
index 07b9ad0..694b94b 100644
--- a/core/proto/android/os/system_properties.proto
+++ b/core/proto/android/os/system_properties.proto
@@ -134,6 +134,8 @@
optional bool hal_instrumentation_enable = 11;
message InitSvc {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
enum Status {
STATUS_UNKNOWN = 0;
STATUS_RUNNING = 1;
@@ -230,7 +232,7 @@
// Read only properites on the device.
message Ro {
- optional bool adb_secure = 1;
+ optional bool adb_secure = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional string arch = 2;
optional bool audio_ignore_effects = 3;
optional bool audio_monitorRotation = 4;
@@ -265,6 +267,8 @@
// boot.img's properties.
message BootImage {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
// When the boot.img is built.
optional string build_date = 1;
// UTC timestamp of build date.
@@ -278,12 +282,14 @@
optional BootImage bootimage = 8;
// Version of bootloader on device.
- optional string bootloader = 9;
+ optional string bootloader = 9 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Kernel bootmode, e.g. charger.
- optional string bootmode = 10;
+ optional string bootmode = 10 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Android Platform build metadata.
message Build {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string date = 1;
optional int64 date_utc = 2;
optional string description = 3;
@@ -297,6 +303,8 @@
optional string user = 11;
message Version {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string base_os = 1;
optional string codename = 2;
optional string incremental = 3;
@@ -313,10 +321,10 @@
}
optional Build build = 11;
- optional bool camera_notify_nfc = 12;
+ optional bool camera_notify_nfc = 12 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional string carrier = 13;
- optional bool com_android_dataroaming = 14;
- optional bool com_android_prov_mobiledata = 15;
+ optional bool com_android_dataroaming = 14 [ (android.privacy).dest = DEST_AUTOMATIC ];
+ optional bool com_android_prov_mobiledata = 15 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional string com_google_clientidbase = 16;
message Config {
@@ -341,6 +349,8 @@
optional string gfx_driver_0 = 26;
message Hardware {
+ option (android.msg_privacy).dest = DEST_LOCAL;
+
optional string value = 1; // value of ro.hardware itself
optional string activity_recognition = 2;
@@ -392,6 +402,8 @@
optional int32 opengles_version = 31;
message Product {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string board = 1;
optional string brand = 2;
optional string cpu_abi = 3;
@@ -405,6 +417,8 @@
optional string name = 11;
message Vendor {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string brand = 1;
optional string device = 2;
optional string manufacturer = 3;
diff --git a/core/proto/android/server/activitymanagerservice.proto b/core/proto/android/server/activitymanagerservice.proto
index 1434d82..39c5ec7 100644
--- a/core/proto/android/server/activitymanagerservice.proto
+++ b/core/proto/android/server/activitymanagerservice.proto
@@ -32,10 +32,13 @@
import "frameworks/base/core/proto/android/server/intentresolver.proto";
import "frameworks/base/core/proto/android/server/windowmanagerservice.proto";
import "frameworks/base/core/proto/android/util/common.proto";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
option java_multiple_files = true;
message ActivityManagerServiceProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional ActivityStackSupervisorProto activities = 1;
optional BroadcastProto broadcasts = 2;
@@ -47,6 +50,8 @@
// "dumpsys activity --proto activities"
message ActivityStackSupervisorProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;
repeated ActivityDisplayProto displays = 2;
optional KeyguardControllerProto keyguard_controller = 3;
@@ -56,12 +61,16 @@
/* represents ActivityStackSupervisor.ActivityDisplay */
message ActivityDisplayProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;
optional int32 id = 2;
repeated ActivityStackProto stacks = 3;
}
message ActivityStackProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;
optional int32 id = 2;
repeated TaskRecordProto tasks = 3;
@@ -72,6 +81,8 @@
}
message TaskRecordProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;
optional int32 id = 2;
repeated ActivityRecordProto activities = 3;
@@ -88,6 +99,8 @@
}
message ActivityRecordProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;
optional .com.android.server.wm.proto.IdentifierProto identifier = 2;
optional string state = 3;
@@ -97,12 +110,16 @@
}
message KeyguardControllerProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional bool keyguard_showing = 1;
optional bool keyguard_occluded = 2;
}
// "dumpsys activity --proto broadcasts"
message BroadcastProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
repeated ReceiverListProto receiver_list = 1;
optional .com.android.server.IntentResolverProto receiver_resolver = 2;
@@ -119,6 +136,8 @@
}
message ReceiverListProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional ProcessRecordProto app = 1;
optional int32 pid = 2;
optional int32 uid = 3;
@@ -130,6 +149,8 @@
}
message ProcessRecordProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 pid = 1;
optional string process_name = 2;
optional int32 uid = 3;
@@ -140,11 +161,15 @@
}
message BroadcastRecordProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 user_id = 1;
optional string intent_action = 2;
}
message BroadcastFilterProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional .android.content.IntentFilterProto intent_filter = 1;
optional string required_permission = 2;
optional string hex_hash = 3; // used to find the object in IntentResolver
@@ -152,6 +177,8 @@
}
message BroadcastQueueProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string queue_name = 1;
repeated BroadcastRecordProto parallel_broadcasts = 2;
repeated BroadcastRecordProto ordered_broadcasts = 3;
@@ -159,6 +186,8 @@
repeated BroadcastRecordProto historical_broadcasts = 5;
message BroadcastSummary {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional .android.content.IntentProto intent = 1;
optional int64 enqueue_clock_time_ms = 2;
optional int64 dispatch_clock_time_ms = 3;
@@ -168,14 +197,20 @@
}
message MemInfoProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int64 uptime_duration_ms = 1;
optional int64 elapsed_realtime_ms = 2;
message ProcessMemory {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 pid = 1;
optional string process_name = 2;
message MemoryInfo {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string name = 1;
// The proportional set size for the heap.
optional int32 total_pss_kb = 2;
@@ -197,6 +232,8 @@
}
}
message HeapInfo {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional MemoryInfo mem_info = 1;
optional int32 heap_size_kb = 2;
optional int32 heap_alloc_kb = 3;
@@ -212,6 +249,8 @@
repeated MemoryInfo dalvik_details = 8;
message AppSummary {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 java_heap_pss_kb = 1;
optional int32 native_heap_pss_kb = 2;
optional int32 code_pss_kb = 3;
@@ -230,9 +269,13 @@
repeated ProcessMemory native_processes = 3;
message AppData {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional ProcessMemory process_memory = 1;
message ObjectStats {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 view_instance_count = 1;
optional int32 view_root_instance_count = 2;
optional int32 app_context_instance_count = 3;
@@ -250,11 +293,15 @@
optional ObjectStats objects = 2;
message SqlStats {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 memory_used_kb = 1;
optional int32 pagecache_overflow_kb = 2;
optional int32 malloc_size_kb = 3;
message Database {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string name = 1;
optional int32 page_size = 2;
optional int32 db_size = 3;
@@ -274,6 +321,8 @@
repeated AppData app_processes = 4;
message MemItem {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string tag = 1;
optional string label = 2;
optional int32 id = 3;
@@ -337,9 +386,13 @@
}
message StickyBroadcastProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 user = 1;
message StickyAction {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string name = 1;
repeated .android.content.IntentProto intents = 2;
}
@@ -348,6 +401,7 @@
// "dumpsys activity --proto service"
message ActiveServicesProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
message ServicesByUser {
optional int32 user_id = 1;
@@ -358,11 +412,15 @@
// corresponds to ActivityManagerService.GrantUri Java class
message GrantUriProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 source_user_id = 1;
- optional string uri = 2;
+ optional string uri = 2 [ (.android.privacy).dest = DEST_EXPLICIT ];
}
message NeededUriGrantsProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string target_package = 1;
optional int32 target_uid = 2;
optional int32 flags = 3;
@@ -371,12 +429,16 @@
}
message UriPermissionOwnerProto {
+ option (.android.msg_privacy).dest = DEST_EXPLICIT;
+
optional string owner = 1;
repeated GrantUriProto read_perms = 2;
repeated GrantUriProto write_perms = 3;
}
message ServiceRecordProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string short_name = 1;
optional string hex_hash = 2;
optional bool is_running = 3; // false if the application service is null
@@ -387,6 +449,8 @@
optional string permission = 8;
message AppInfo {
+ option (.android.msg_privacy).dest = DEST_EXPLICIT;
+
optional string base_dir = 1;
optional string res_dir = 2;
optional string data_dir = 3;
@@ -398,6 +462,8 @@
optional bool delayed = 13;
message Foreground {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 id = 1;
optional .android.app.NotificationProto notification = 2;
}
@@ -411,6 +477,8 @@
// variables used to track states related to service start
message Start {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional bool start_requested = 1;
optional bool delayed_stop = 2;
optional bool stop_if_killed = 3;
@@ -420,6 +488,8 @@
optional Start start = 20;
message ExecuteNesting {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 execute_nesting = 1;
optional bool execute_fg = 2;
optional .android.util.Duration executing_start = 3;
@@ -429,6 +499,8 @@
optional .android.util.Duration destory_time = 22;
message Crash {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 restart_count = 1;
optional .android.util.Duration restart_delay = 2;
optional .android.util.Duration next_restart_time = 3;
@@ -437,6 +509,8 @@
optional Crash crash = 23;
message StartItemProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 id = 1;
optional .android.util.Duration duration = 2;
optional int32 delivery_count = 3;
@@ -453,6 +527,8 @@
}
message ConnectionRecordProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string hex_hash = 1;
optional int32 user_id = 2;
@@ -480,12 +556,16 @@
}
message AppBindRecordProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string hex_hash = 1;
optional ProcessRecordProto client = 2;
repeated ConnectionRecordProto connections = 3;
}
message IntentBindRecordProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string hex_hash = 1;
optional bool is_create = 2;
optional .android.content.IntentProto intent = 3;
@@ -500,6 +580,8 @@
// TODO: "dumpsys activity --proto processes"
message ProcessesProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
repeated ProcessRecordProto procs = 1;
repeated ProcessRecordProto isolated_procs = 2;
repeated ActiveInstrumentationProto active_instrumentations = 3;
@@ -508,6 +590,8 @@
// Process LRU list (sorted by oom_adj)
message LruProcesses {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 size = 1;
optional int32 non_act_at = 2;
optional int32 non_svc_at = 3;
@@ -538,18 +622,24 @@
optional bool config_will_change = 21;
message ScreenCompatPackage {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string package = 1;
optional int32 mode = 2;
}
repeated ScreenCompatPackage screen_compat_packages = 22;
message UidObserverRegistrationProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 uid = 1;
optional string package = 2;
repeated .android.app.UidObserverFlag flags = 3;
optional int32 cut_point = 4; // only available when UID_OBSERVER_PROCSTATE is on
message ProcState {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 uid = 1;
optional int32 state = 2;
}
@@ -560,6 +650,8 @@
repeated int32 device_idle_temp_whitelist = 25;
message PendingTempWhitelist {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 target_uid = 1;
optional int64 duration_ms = 2;
optional string tag = 3;
@@ -567,6 +659,8 @@
repeated PendingTempWhitelist pending_temp_whitelist = 26;
message SleepStatus {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional .android.os.PowerManagerInternalProto.Wakefulness wakefulness = 1;
repeated string sleep_tokens = 2;
optional bool sleeping = 3;
@@ -576,12 +670,16 @@
optional SleepStatus sleep_status = 27;
message VoiceProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string session = 1;
optional .android.os.PowerManagerProto.WakeLockProto wakelock = 2;
}
optional VoiceProto running_voice = 28;
message VrControllerProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
enum VrMode {
FLAG_NON_VR_MODE = 0;
FLAG_VR_MODE = 1;
@@ -593,6 +691,8 @@
optional VrControllerProto vr_controller = 29;
message DebugApp {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string debug_app = 1;
optional string orig_debug_app = 2;
optional bool debug_transient = 3;
@@ -602,10 +702,16 @@
optional AppTimeTrackerProto current_tracker = 31;
message MemWatchProcess {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
message Process {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string name = 1;
message MemStats {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 uid = 1;
optional string size = 2;
optional string report_to = 3;
@@ -615,8 +721,10 @@
repeated Process procs = 1;
message Dump {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string proc_name = 1;
- optional string file = 2;
+ optional string file = 2 [ (.android.privacy).dest = DEST_EXPLICIT ];
optional int32 pid = 3;
optional int32 uid = 4;
}
@@ -626,6 +734,8 @@
optional string track_allocation_app = 33;
message Profile {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string app_name = 1;
optional ProcessRecordProto proc = 2;
optional .android.app.ProfilerInfoProto info = 3;
@@ -636,6 +746,8 @@
optional bool always_finish_activities = 36;
message Controller {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string controller = 1;
optional bool is_a_monkey = 2;
}
@@ -666,6 +778,8 @@
}
message ActiveInstrumentationProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional .android.content.ComponentNameProto class = 1;
optional bool finished = 2;
repeated ProcessRecordProto running_processes = 3;
@@ -674,11 +788,13 @@
optional string profile_file = 6;
optional string watcher = 7;
optional string ui_automation_connection = 8;
- optional string arguments = 9;
+ optional string arguments = 9 [ (.android.privacy).dest = DEST_EXPLICIT ];
}
// Proto definition of com.android.server.am.UidRecord.java
message UidRecordProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string hex_hash = 1;
optional int32 uid = 2;
optional .android.app.ProcessState current = 3;
@@ -699,6 +815,8 @@
optional int32 num_procs = 10;
message ProcStateSequence {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int64 cururent = 1;
optional int64 last_network_updated = 2;
optional int64 last_dispatched = 3;
@@ -708,12 +826,16 @@
// proto of class ImportanceToken in ActivityManagerService
message ImportanceTokenProto {
+ option (.android.msg_privacy).dest = DEST_EXPLICIT;
+
optional int32 pid = 1;
optional string token = 2;
optional string reason = 3;
}
message ProcessOomProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional bool persistent = 1;
optional int32 num = 2;
optional string oom_adj = 3;
@@ -749,6 +871,8 @@
}
message Detail {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 max_adj = 1;
optional int32 cur_raw_adj = 2;
optional int32 set_raw_adj = 3;
@@ -765,6 +889,8 @@
// only make sense if process is a service
message CpuRunTime {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int64 over_ms = 1;
optional int64 used_ms = 2;
optional float ultilization = 3; // ratio of cpu time usage
@@ -775,6 +901,8 @@
}
message ProcessToGcProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional ProcessRecordProto proc = 1;
optional bool report_low_memory = 2;
optional int64 now_uptime_ms = 3;
@@ -784,13 +912,18 @@
// sync with com.android.server.am.AppErrors.java
message AppErrorsProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
optional int64 now_uptime_ms = 1;
message ProcessCrashTime {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string process_name = 1;
message Entry {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 uid = 1;
optional int64 last_crashed_at_ms = 2;
}
@@ -799,14 +932,18 @@
repeated ProcessCrashTime process_crash_times = 2;
message BadProcess {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string process_name = 1;
message Entry {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 uid = 1;
optional int64 crashed_at_ms = 2;
optional string short_msg = 3;
- optional string long_msg = 4;
- optional string stack = 5;
+ optional string long_msg = 4 [ (.android.privacy).dest = DEST_EXPLICIT ];
+ optional string stack = 5 [ (.android.privacy).dest = DEST_EXPLICIT ];
}
repeated Entry entries = 2;
}
@@ -815,6 +952,8 @@
// sync with com.android.server.am.UserState.java
message UserStateProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
enum State {
STATE_BOOTING = 0;
STATE_RUNNING_LOCKED = 1;
@@ -829,7 +968,11 @@
// sync with com.android.server.am.UserController.java
message UserControllerProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
message User {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 id = 1;
optional UserStateProto state = 2;
}
@@ -838,6 +981,8 @@
repeated int32 user_lru = 3;
message UserProfile {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 user = 1;
optional int32 profile = 2;
}
@@ -846,6 +991,8 @@
// sync with com.android.server.am.AppTimeTracker.java
message AppTimeTrackerProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string receiver = 1;
optional int64 total_duration_ms = 2;
diff --git a/core/proto/android/server/appwindowthumbnail.proto b/core/proto/android/server/appwindowthumbnail.proto
index e67b854..8f48d75 100644
--- a/core/proto/android/server/appwindowthumbnail.proto
+++ b/core/proto/android/server/appwindowthumbnail.proto
@@ -17,6 +17,7 @@
syntax = "proto2";
import "frameworks/base/core/proto/android/server/surfaceanimator.proto";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
package com.android.server.wm.proto;
option java_multiple_files = true;
@@ -25,6 +26,8 @@
* Represents a {@link com.android.server.wm.AppWindowThumbnail} object.
*/
message AppWindowThumbnailProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 width = 1;
optional int32 height = 2;
optional SurfaceAnimatorProto surface_animator = 3;
diff --git a/core/proto/android/server/fingerprint.proto b/core/proto/android/server/fingerprint.proto
index ec4ffe0..2a7fbc3 100644
--- a/core/proto/android/server/fingerprint.proto
+++ b/core/proto/android/server/fingerprint.proto
@@ -17,15 +17,21 @@
syntax = "proto2";
package com.android.server.fingerprint;
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
option java_multiple_files = true;
option java_outer_classname = "FingerprintServiceProto";
message FingerprintServiceDumpProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
// Each log may include multiple tuples of (user_id, num_fingerprints).
repeated FingerprintUserStatsProto users = 1;
}
message FingerprintUserStatsProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
// Should be 0, 10, 11, 12, etc. where 0 is the owner.
optional int32 user_id = 1;
@@ -42,6 +48,8 @@
// A com.android.server.fingerprint.FingerpintService.PerformanceStats object.
message PerformanceStatsProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
// Number of accepted fingerprints.
optional int32 accept = 1;
diff --git a/core/proto/android/server/surfaceanimator.proto b/core/proto/android/server/surfaceanimator.proto
index 60713d7..7f7839e 100644
--- a/core/proto/android/server/surfaceanimator.proto
+++ b/core/proto/android/server/surfaceanimator.proto
@@ -17,6 +17,7 @@
syntax = "proto2";
import "frameworks/base/core/proto/android/view/surfacecontrol.proto";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
package com.android.server.wm.proto;
option java_multiple_files = true;
@@ -25,6 +26,8 @@
* Represents a {@link com.android.server.wm.SurfaceAnimator} object.
*/
message SurfaceAnimatorProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string animation_adapter = 1;
optional .android.view.SurfaceControlProto leash = 2;
optional bool animation_start_delayed = 3;
diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto
index 71f33c7..c11058a 100644
--- a/core/proto/android/server/windowmanagerservice.proto
+++ b/core/proto/android/server/windowmanagerservice.proto
@@ -26,12 +26,15 @@
import "frameworks/base/core/proto/android/view/displayinfo.proto";
import "frameworks/base/core/proto/android/view/surface.proto";
import "frameworks/base/core/proto/android/view/windowlayoutparams.proto";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
package com.android.server.wm.proto;
option java_multiple_files = true;
message WindowManagerServiceProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional WindowManagerPolicyProto policy = 1;
/* window hierarchy root */
optional RootWindowContainerProto root_window_container = 2;
@@ -46,6 +49,8 @@
/* represents DisplayContent */
message RootWindowContainerProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional WindowContainerProto window_container = 1;
repeated DisplayProto displays = 2;
/* window references in top down z order */
@@ -53,16 +58,22 @@
}
message BarControllerProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional .android.app.StatusBarManagerProto.WindowState state = 1;
optional .android.app.StatusBarManagerProto.TransientWindowState transient_state = 2;
}
message WindowOrientationListenerProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional bool enabled = 1;
optional .android.view.SurfaceProto.Rotation rotation = 2;
}
message KeyguardServiceDelegateProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional bool showing = 1;
optional bool occluded = 2;
optional bool secure = 3;
@@ -84,6 +95,8 @@
/* represents PhoneWindowManager */
message WindowManagerPolicyProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 last_system_ui_flags = 1;
enum UserRotationMode {
USER_ROTATION_FREE = 0;
@@ -112,6 +125,8 @@
/* represents AppTransition */
message AppTransitionProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
enum AppState {
APP_STATE_IDLE = 0;
APP_STATE_READY = 1;
@@ -147,6 +162,8 @@
/* represents DisplayContent */
message DisplayProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional WindowContainerProto window_container = 1;
optional int32 id = 2;
repeated StackProto stacks = 3;
@@ -165,22 +182,30 @@
/* represents DisplayFrames */
message DisplayFramesProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional .android.graphics.RectProto stable_bounds = 1;
}
/* represents DockedStackDividerController */
message DockedStackDividerControllerProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional bool minimized_dock = 1;
}
/* represents PinnedStackController */
message PinnedStackControllerProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional .android.graphics.RectProto default_bounds = 1;
optional .android.graphics.RectProto movement_bounds = 2;
}
/* represents TaskStack */
message StackProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional WindowContainerProto window_container = 1;
optional int32 id = 2;
repeated TaskProto tasks = 3;
@@ -197,6 +222,8 @@
/* represents Task */
message TaskProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional WindowContainerProto window_container = 1;
optional int32 id = 2;
repeated AppWindowTokenProto app_window_tokens = 3;
@@ -208,8 +235,10 @@
/* represents AppWindowToken */
message AppWindowTokenProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
/* obtained from ActivityRecord */
- optional string name = 1;
+ optional string name = 1 [ (.android.privacy).dest = DEST_EXPLICIT ];
optional WindowTokenProto window_token = 2;
optional bool last_surface_showing = 3;
optional bool is_waiting_for_transition_start = 4;
@@ -236,6 +265,8 @@
/* represents WindowToken */
message WindowTokenProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional WindowContainerProto window_container = 1;
optional int32 hash_code = 2;
repeated WindowStateProto windows = 3;
@@ -246,6 +277,8 @@
/* represents WindowState */
message WindowStateProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional WindowContainerProto window_container = 1;
optional IdentifierProto identifier = 2;
optional int32 display_id = 3;
@@ -287,13 +320,17 @@
}
message IdentifierProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 hash_code = 1;
optional int32 user_id = 2;
- optional string title = 3;
+ optional string title = 3 [ (.android.privacy).dest = DEST_EXPLICIT ];
}
/* represents WindowStateAnimator */
message WindowStateAnimatorProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional .android.graphics.RectProto last_clip_rect = 1;
optional WindowSurfaceControllerProto surface = 2;
enum DrawState {
@@ -309,18 +346,24 @@
/* represents WindowSurfaceController */
message WindowSurfaceControllerProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional bool shown = 1;
optional int32 layer = 2;
}
/* represents ScreenRotationAnimation */
message ScreenRotationAnimationProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional bool started = 1;
optional bool animation_running = 2;
}
/* represents WindowContainer */
message WindowContainerProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional ConfigurationContainerProto configuration_container = 1;
optional int32 orientation = 2;
optional bool visible = 3;
@@ -329,6 +372,8 @@
/* represents ConfigurationContainer */
message ConfigurationContainerProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional .android.content.ConfigurationProto override_configuration = 1;
optional .android.content.ConfigurationProto full_configuration = 2;
optional .android.content.ConfigurationProto merged_override_configuration = 3;
diff --git a/core/proto/android/service/diskstats.proto b/core/proto/android/service/diskstats.proto
index 3c7a0e3..3d7ee91 100644
--- a/core/proto/android/service/diskstats.proto
+++ b/core/proto/android/service/diskstats.proto
@@ -17,10 +17,14 @@
syntax = "proto2";
package android.service.diskstats;
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
option java_multiple_files = true;
option java_outer_classname = "DiskStatsServiceProto";
message DiskStatsServiceDumpProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
enum EncryptionType {
// Unknown encryption type
ENCRYPTION_UNKNOWN = 0;
@@ -34,7 +38,7 @@
// Whether the latency test resulted in an error
optional bool has_test_error = 1;
// If the test errored, error message is contained here
- optional string error_message = 2;
+ optional string error_message = 2 [ (android.privacy).dest = DEST_EXPLICIT ];
// 512B write latency in milliseconds, if the test was successful
optional int32 write_512b_latency_millis = 3;
// Free Space in the major partitions
@@ -48,6 +52,8 @@
}
message DiskStatsCachedValuesProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
// Total app code size, in kilobytes
optional int64 agg_apps_size = 1;
// Total app cache size, in kilobytes
@@ -71,6 +77,8 @@
}
message DiskStatsAppSizesProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
// Name of the package
optional string package_name = 1;
// App's code size in kilobytes
@@ -82,6 +90,8 @@
}
message DiskStatsFreeSpaceProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
enum Folder {
// Data folder
FOLDER_DATA = 0;
diff --git a/core/proto/android/service/netstats.proto b/core/proto/android/service/netstats.proto
index ad9191c..29fd195 100644
--- a/core/proto/android/service/netstats.proto
+++ b/core/proto/android/service/netstats.proto
@@ -17,11 +17,15 @@
syntax = "proto2";
package android.service;
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
option java_multiple_files = true;
option java_outer_classname = "NetworkStatsServiceProto";
// Represents dumpsys from NetworkStatsService (netstats).
message NetworkStatsServiceDumpProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
repeated NetworkInterfaceProto active_interfaces = 1;
repeated NetworkInterfaceProto active_uid_interfaces = 2;
@@ -41,6 +45,8 @@
// Corresponds to NetworkStatsService.mActiveIfaces/mActiveUidIfaces.
message NetworkInterfaceProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string interface = 1;
optional NetworkIdentitySetProto identities = 2;
@@ -48,17 +54,21 @@
// Corresponds to NetworkIdentitySet.
message NetworkIdentitySetProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
repeated NetworkIdentityProto identities = 1;
}
// Corresponds to NetworkIdentity.
message NetworkIdentityProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
// Constats from ConnectivityManager.TYPE_*.
optional int32 type = 1;
- optional string subscriber_id = 2;
+ optional string subscriber_id = 2 [ (android.privacy).dest = DEST_EXPLICIT ];
- optional string network_id = 3;
+ optional string network_id = 3 [ (android.privacy).dest = DEST_EXPLICIT ];
optional bool roaming = 4;
@@ -69,6 +79,8 @@
// Corresponds to NetworkStatsRecorder.
message NetworkStatsRecorderProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int64 pending_total_bytes = 1;
optional NetworkStatsCollectionProto complete_history = 2;
@@ -76,11 +88,15 @@
// Corresponds to NetworkStatsCollection.
message NetworkStatsCollectionProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
repeated NetworkStatsCollectionStatsProto stats = 1;
}
// Corresponds to NetworkStatsCollection.mStats.
message NetworkStatsCollectionStatsProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional NetworkStatsCollectionKeyProto key = 1;
optional NetworkStatsHistoryProto history = 2;
@@ -88,6 +104,8 @@
// Corresponds to NetworkStatsCollection.Key.
message NetworkStatsCollectionKeyProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional NetworkIdentitySetProto identity = 1;
optional int32 uid = 2;
@@ -99,6 +117,8 @@
// Corresponds to NetworkStatsHistory.
message NetworkStatsHistoryProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
// Duration for this bucket in milliseconds.
optional int64 bucket_duration_ms = 1;
@@ -107,6 +127,8 @@
// Corresponds to each bucket in NetworkStatsHistory.
message NetworkStatsHistoryBucketProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
// Bucket start time in milliseconds since epoch.
optional int64 bucket_start_ms = 1;
diff --git a/core/proto/android/service/package.proto b/core/proto/android/service/package.proto
index aa1a575..ef777de 100644
--- a/core/proto/android/service/package.proto
+++ b/core/proto/android/service/package.proto
@@ -18,18 +18,25 @@
package android.service.pm;
import "frameworks/base/core/proto/android/content/featureinfo.proto";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
option java_multiple_files = true;
option java_outer_classname = "PackageServiceProto";
message PackageServiceDumpProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
message PackageShortProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
// Name of package. e.g. "com.android.providers.telephony".
optional string name = 1;
// UID for this package as assigned by Android OS.
optional int32 uid = 2;
}
message SharedLibraryProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional string name = 1;
// True if library path is not null (jar), false otherwise (apk)
optional bool is_jar = 2;
@@ -39,8 +46,10 @@
optional string apk = 4;
}
message SharedUserProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 user_id = 1;
- optional string name = 2;
+ optional string name = 2 [ (android.privacy).dest = DEST_EXPLICIT ];
}
// Installed packages.
@@ -51,15 +60,22 @@
repeated PackageProto packages = 5;
repeated SharedUserProto shared_users = 6;
// Messages from the settings problem file
- repeated string messages = 7;
+ repeated string messages = 7 [ (android.privacy).dest = DEST_EXPLICIT ];
}
message PackageProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
message SplitProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
+ // The split name of package, e.g. base
optional string name = 1;
optional int32 revision_code = 2;
}
message UserInfoProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
enum InstallType {
NOT_INSTALLED_FOR_USER = 0;
FULL_APP_INSTALL = 1;
diff --git a/core/proto/android/service/procstats.proto b/core/proto/android/service/procstats.proto
index b2e0373..4c11f1e 100644
--- a/core/proto/android/service/procstats.proto
+++ b/core/proto/android/service/procstats.proto
@@ -19,6 +19,7 @@
option java_outer_classname = "ProcessStatsServiceProto";
import "frameworks/base/core/proto/android/util/common.proto";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
package android.service.procstats;
@@ -28,6 +29,7 @@
* Next Tag: 4
*/
message ProcessStatsServiceDumpProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
optional ProcessStatsSectionProto procstats_now = 1;
@@ -43,6 +45,7 @@
* Next Tag: 9
*/
message ProcessStatsSectionProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
// Elapsed realtime at start of report.
optional int64 start_realtime_ms = 1;
@@ -78,6 +81,7 @@
// Next Tag: 6
message ProcessStatsProto {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
// Name of process.
optional string process = 1;
@@ -87,6 +91,8 @@
// Information about how often kills occurred
message Kill {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
// Count of excessive CPU kills
optional int32 cpu = 1;
@@ -99,6 +105,8 @@
optional Kill kill = 3;
message State {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
+
enum ScreenState {
SCREEN_UNKNOWN = 0;
OFF = 1;
@@ -115,6 +123,8 @@
}
optional MemoryState memory_state = 2;
+ // this enum list is from frameworks/base/core/java/com/android/internal/app/procstats/ProcessStats.java
+ // and not frameworks/base/core/java/android/app/ActivityManager.java
enum ProcessState {
PROCESS_UNKNOWN = 0;
// Persistent system process.
@@ -127,14 +137,14 @@
IMPORTANT_BACKGROUND = 4;
// Performing backup operation.
BACKUP = 5;
- // Heavy-weight process (currently not used).
- HEAVY_WEIGHT = 6;
// Background process running a service.
- SERVICE = 7;
+ SERVICE = 6;
// Process not running, but would be if there was enough RAM.
- SERVICE_RESTARTING = 8;
+ SERVICE_RESTARTING = 7;
// Process running a receiver.
- RECEIVER = 9;
+ RECEIVER = 8;
+ // Heavy-weight process (currently not used).
+ HEAVY_WEIGHT = 9;
// Process hosting home/launcher app when not on top.
HOME = 10;
// Process hosting the last app the user was in.
diff --git a/core/proto/android/util/common.proto b/core/proto/android/util/common.proto
index 308ef70..f8f7885 100644
--- a/core/proto/android/util/common.proto
+++ b/core/proto/android/util/common.proto
@@ -17,12 +17,15 @@
syntax = "proto2";
package android.util;
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
option java_multiple_files = true;
/**
* Very basic data structure used by aggregated stats.
*/
message AggStats {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
optional int64 min = 1;
@@ -35,6 +38,7 @@
* Very basic data structure to represent Duration.
*/
message Duration {
+ option (android.msg_privacy).dest = DEST_AUTOMATIC;
optional int64 start_ms = 1;
diff --git a/core/proto/android/util/log.proto b/core/proto/android/util/log.proto
index fd4fa9e..416c055 100644
--- a/core/proto/android/util/log.proto
+++ b/core/proto/android/util/log.proto
@@ -17,11 +17,15 @@
syntax = "proto2";
package android.util;
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
option java_multiple_files = true;
// Represents a Text Log in logd
// Next Tag: 9
message TextLogEntry {
+ option (android.msg_privacy).dest = DEST_EXPLICIT;
+
optional uint64 sec = 1;
optional uint64 nanosec = 2;
@@ -47,6 +51,8 @@
// Represents a Binary Log in logd, need to look event-log-tags for more info.
// Next Tag: 8
message BinaryLogEntry {
+ option (android.msg_privacy).dest = DEST_EXPLICIT;
+
optional uint64 sec = 1;
optional uint64 nanosec = 2;
optional int32 uid = 3;
@@ -81,6 +87,8 @@
}
message LogProto {
+ option (android.msg_privacy).dest = DEST_EXPLICIT;
+
repeated TextLogEntry text_logs = 1;
repeated BinaryLogEntry binary_logs = 2;
diff --git a/core/proto/android/view/displayinfo.proto b/core/proto/android/view/displayinfo.proto
index 9ca4046..3ac8f3b 100644
--- a/core/proto/android/view/displayinfo.proto
+++ b/core/proto/android/view/displayinfo.proto
@@ -17,10 +17,14 @@
syntax = "proto2";
package android.view;
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
+
option java_multiple_files = true;
/* represents DisplayInfo */
message DisplayInfoProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 logical_width = 1;
optional int32 logical_height = 2;
optional int32 app_width = 3;
diff --git a/core/proto/android/view/windowlayoutparams.proto b/core/proto/android/view/windowlayoutparams.proto
index f079e1e..0362ab1 100644
--- a/core/proto/android/view/windowlayoutparams.proto
+++ b/core/proto/android/view/windowlayoutparams.proto
@@ -18,12 +18,15 @@
import "frameworks/base/core/proto/android/graphics/pixelformat.proto";
import "frameworks/base/core/proto/android/view/display.proto";
+import "frameworks/base/libs/incident/proto/android/privacy.proto";
package android.view;
option java_multiple_files = true;
/* represents WindowManager.LayoutParams */
message WindowLayoutParamsProto {
+ option (.android.msg_privacy).dest = DEST_AUTOMATIC;
+
optional int32 type = 1;
optional int32 x = 2;
optional int32 y = 3;