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

Commit a4243cf9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update privacy filter for incident report protos." into rvc-dev am:... 

Merge "Update privacy filter for incident report protos." into rvc-dev am: f9a1e1cb am: 19ad54b6 am: 2fc75dae am: d81c1265

Change-Id: I35701293ebb6242d7183d00e858397d296295c86
parents cfd142ae d81c1265

core/proto/Android.bp

+0 −10
Original line number Diff line number Diff line
@@ -28,13 +28,3 @@ cc_library_static { 
        "android/bluetooth/smp/enums.proto",

    ],

}
 


java_library_host {

    name: "protolog-proto",

    srcs: [

        "android/server/protolog.proto"

    ],

    proto: {

        type: "full",

    },

}

core/proto/android/app/appexitinfo.proto

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ message ApplicationExitInfoProto { 
    optional int64 pss = 11;

    optional int64 rss = 12;

    optional int64 timestamp = 13;

    optional string description = 14;

    optional string description = 14 [(.android.privacy).dest = DEST_EXPLICIT];

    optional bytes state = 15;

    optional string trace_file = 16;

}

core/proto/android/content/locusid.proto

+3 −1
Original line number Diff line number Diff line
@@ -20,8 +20,10 @@ package android.content; 


option java_multiple_files = true;



import "frameworks/base/core/proto/android/privacy.proto";



// On disk representation of android.content.LocusId. Currently used by

// com.android.server.people.ConversationInfoProto.

message LocusIdProto {

  optional string locus_id = 1;

    optional string locus_id = 1 [(.android.privacy).dest = DEST_EXPLICIT];

}

core/proto/android/nfc/aid_group.proto

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ option java_multiple_files = true; 


// Debugging information for android.nfc.cardemulation.AidGroup

message AidGroupProto {

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

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



    optional string category = 1;

    // A group of Application Identifiers. A hexadecimal string, with an even amount of hexadecimal

core/proto/android/nfc/apdu_service_info.proto

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ option java_multiple_files = true; 


// Debugging information for android.nfc.cardemulation.ApduServiceInfo

message ApduServiceInfoProto {

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

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



    optional .android.content.ComponentNameProto component_name = 1;

    optional string description = 2;