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

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

Merge "Adding privacy tags to JobScheduler and co."

parents 0193e565 0f168dee

core/proto/android/content/clipdata.proto

+7 −0
Original line number Diff line number Diff line
@@ -21,13 +21,18 @@ option java_multiple_files = true; 


import "frameworks/base/core/proto/android/content/clipdescription.proto";

import "frameworks/base/core/proto/android/content/intent.proto";

import "frameworks/base/libs/incident/proto/android/privacy.proto";



// An android.content.ClipData object.

message ClipDataProto {

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



    optional android.content.ClipDescriptionProto description = 1;



    // Custom dump of an android.graphics.Bitmap object.

    message Icon {

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



        optional int32 width = 1;

        optional int32 height = 2;

    }
@@ -35,6 +40,8 @@ message ClipDataProto { 


    // An android.content.ClipData.Item object.

    message Item {

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



        oneof data {

            string html_text = 1;

            string text = 2;

core/proto/android/content/clipdescription.proto

+4 −1
Original line number Diff line number Diff line
@@ -20,11 +20,14 @@ package android.content; 
option java_multiple_files = true;



import "frameworks/base/core/proto/android/os/persistablebundle.proto";

import "frameworks/base/libs/incident/proto/android/privacy.proto";



// An android.content.ClipDescription object.

message ClipDescriptionProto {

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



    repeated string mime_types = 1;

    optional string label = 2;

    optional string label = 2 [ (.android.privacy).dest = DEST_EXPLICIT ];

    optional android.os.PersistableBundleProto extras = 3;

    optional int64 timestamp_ms = 4;

}

core/proto/android/content/component_name.proto

+4 −0
Original line number Diff line number Diff line
@@ -20,10 +20,14 @@ option java_multiple_files = true; 


package android.content;



import "frameworks/base/libs/incident/proto/android/privacy.proto";



/**

 * An android.content.ComponentName object.

 */

message ComponentNameProto {

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



    optional string package_name = 1;

    optional string class_name = 2;

}

core/proto/android/net/network.proto

+6 −1
Original line number Diff line number Diff line
@@ -19,9 +19,14 @@ option java_multiple_files = true; 


package android.net;



import "frameworks/base/libs/incident/proto/android/privacy.proto";



/**

 * An android.net.Network object.

 */

message NetworkProto {

    optional int32 net_id = 1;

    // The netId is an implementation detail which might be changed in the

    // future, or which alone (i.e. in the absence of some additional context)

    // might not be sufficient to fully identify a Network.

    optional int32 net_id = 1 [ (.android.privacy).dest = DEST_AUTOMATIC ];

}

core/proto/android/net/networkcapabilities.proto

+5 −1
Original line number Diff line number Diff line
@@ -20,10 +20,14 @@ package android.net; 


option java_multiple_files = true;



import "frameworks/base/libs/incident/proto/android/privacy.proto";



/**

 * An android.net.NetworkCapabilities object.

 */

message NetworkCapabilitiesProto {

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



    enum Transport {

        // Indicates this network uses a Cellular transport.

        TRANSPORT_CELLULAR = 0;
@@ -118,7 +122,7 @@ message NetworkCapabilitiesProto { 
    optional int32 link_up_bandwidth_kbps = 3;

    optional int32 link_down_bandwidth_kbps = 4;



    optional string network_specifier = 5;

    optional string network_specifier = 5 [ (.android.privacy).dest = DEST_EXPLICIT ];



    // True if this object specifies a signal strength.

    optional bool can_report_signal_strength = 6;