Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3939810 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Tag platform protos with right privacy level."

parents 5fd366e0 0d7bc2d1

core/proto/android/app/notification.proto

+8 −4
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ syntax = "proto2"; 
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 @@ package android.app; 
 * 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.

core/proto/android/app/profilerinfo.proto

+4 −0
Original line number Diff line number Diff line
@@ -18,12 +18,16 @@ syntax = "proto2"; 
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;

core/proto/android/content/configuration.proto

+3 −0
Original line number Diff line number Diff line
@@ -22,11 +22,14 @@ package android.content; 


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;

core/proto/android/content/featureinfo.proto

+6 −0
Original line number Diff line number Diff line
@@ -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;

}

core/proto/android/content/intent.proto

+10 −3
Original line number Diff line number Diff line
@@ -21,9 +21,12 @@ option java_package = "android.content"; 
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 @@ message IntentProto { 


    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 @@ message IntentProto { 


// 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 IntentFilterProto { 
}



message AuthorityEntryProto {

    option (.android.msg_privacy).dest = DEST_AUTOMATIC;



    optional string host = 1;

    optional bool wild = 2;

    optional int32 port = 3;