diff options
| -rw-r--r-- | core/proto/android/content/intent.proto | 6 | ||||
| -rw-r--r-- | core/proto/android/os/incident.proto | 2 | ||||
| -rw-r--r-- | core/proto/android/os/powermanager.proto | 3 | ||||
| -rw-r--r-- | core/proto/android/os/worksource.proto | 8 | ||||
| -rw-r--r-- | core/proto/android/server/activitymanagerservice.proto | 10 |
5 files changed, 22 insertions, 7 deletions
diff --git a/core/proto/android/content/intent.proto b/core/proto/android/content/intent.proto index c25b46db4a71..1737b625a4aa 100644 --- a/core/proto/android/content/intent.proto +++ b/core/proto/android/content/intent.proto @@ -51,14 +51,14 @@ message IntentProto { optional string action = 1; repeated string categories = 2; - optional string data = 3 [ (.android.privacy).dest = DEST_EXPLICIT ]; + 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 [ (.android.privacy).dest = DEST_EXPLICIT ]; - optional string extras = 10; + optional string clip_data = 9 [ (.android.privacy).dest = DEST_EXPLICIT ]; + optional string extras = 10 [ (.android.privacy).dest = DEST_EXPLICIT ]; optional int32 content_user_hint = 11; optional string selector = 12; } diff --git a/core/proto/android/os/incident.proto b/core/proto/android/os/incident.proto index 828a55f45979..3ec6f057af88 100644 --- a/core/proto/android/os/incident.proto +++ b/core/proto/android/os/incident.proto @@ -123,7 +123,7 @@ message IncidentProto { // Linux services optional Procrank procrank = 2000 [ - (section).type = SECTION_COMMAND, + (section).type = SECTION_NONE, // disable procrank until figure out permission (section).args = "/system/xbin/procrank" ]; diff --git a/core/proto/android/os/powermanager.proto b/core/proto/android/os/powermanager.proto index 8e0a607ef5a5..fecade4217ad 100644 --- a/core/proto/android/os/powermanager.proto +++ b/core/proto/android/os/powermanager.proto @@ -20,6 +20,7 @@ package android.os; option java_multiple_files = true; import "frameworks/base/core/proto/android/os/worksource.proto"; +import "frameworks/base/libs/incident/proto/android/privacy.proto"; message PowerManagerProto { /* User activity events in PowerManager.java. */ @@ -90,6 +91,8 @@ message PowerManagerProto { // WakeLock class in android.os.PowerManager, it is the one used by sdk message WakeLockProto { + option (.android.msg_privacy).dest = DEST_AUTOMATIC; + optional string hex_string = 1; optional bool held = 2; optional int32 internal_count = 3; diff --git a/core/proto/android/os/worksource.proto b/core/proto/android/os/worksource.proto index 2f8b2fbbaa2b..0a9c2ed6e259 100644 --- a/core/proto/android/os/worksource.proto +++ b/core/proto/android/os/worksource.proto @@ -17,15 +17,23 @@ syntax = "proto2"; package android.os; +import "frameworks/base/libs/incident/proto/android/privacy.proto"; + option java_multiple_files = true; message WorkSourceProto { + option (.android.msg_privacy).dest = DEST_AUTOMATIC; + message WorkSourceContentProto { + option (.android.msg_privacy).dest = DEST_AUTOMATIC; + optional int32 uid = 1; optional string name = 2; } message WorkChain { + option (.android.msg_privacy).dest = DEST_AUTOMATIC; + repeated WorkSourceContentProto nodes = 1; } diff --git a/core/proto/android/server/activitymanagerservice.proto b/core/proto/android/server/activitymanagerservice.proto index 55e6a74804ee..788d90127c3d 100644 --- a/core/proto/android/server/activitymanagerservice.proto +++ b/core/proto/android/server/activitymanagerservice.proto @@ -130,6 +130,8 @@ message BroadcastProto { repeated StickyBroadcastProto sticky_broadcasts = 4; message MainHandler { + option (.android.msg_privacy).dest = DEST_AUTOMATIC; + optional string handler = 1; optional .android.os.LooperProto looper = 2; } @@ -663,7 +665,7 @@ message ProcessesProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; optional .android.os.PowerManagerInternalProto.Wakefulness wakefulness = 1; - repeated string sleep_tokens = 2; + repeated string sleep_tokens = 2 [ (.android.privacy).dest = DEST_EXPLICIT ]; optional bool sleeping = 3; optional bool shutting_down = 4; optional bool test_pss_mode = 5; @@ -671,7 +673,7 @@ message ProcessesProto { optional SleepStatus sleep_status = 27; message VoiceProto { - option (.android.msg_privacy).dest = DEST_AUTOMATIC; + option (.android.msg_privacy).dest = DEST_EXPLICIT; optional string session = 1; optional .android.os.PowerManagerProto.WakeLockProto wakelock = 2; @@ -725,7 +727,7 @@ message ProcessesProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; optional string proc_name = 1; - optional string file = 2 [ (.android.privacy).dest = DEST_EXPLICIT ]; + optional string file = 2 [ (.android.privacy).dest = DEST_EXPLICIT ]; optional int32 pid = 3; optional int32 uid = 4; } @@ -998,6 +1000,8 @@ message AppTimeTrackerProto { optional int64 total_duration_ms = 2; message PackageTime { + option (.android.msg_privacy).dest = DEST_AUTOMATIC; + optional string package = 1; optional int64 duration_ms = 2; } |