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

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

Merge "Adding privacy tags to last few protos."

parents f100eea3 5dd53231

core/proto/android/app/window_configuration.proto

+3 −0
Original line number Diff line number Diff line
@@ -21,9 +21,12 @@ option java_multiple_files = true; 
package android.app;



import "frameworks/base/core/proto/android/graphics/rect.proto";

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



/** Proto representation for WindowConfiguration.java class. */

message WindowConfigurationProto {

  option (android.msg_privacy).dest = DEST_AUTOMATIC;



  optional .android.graphics.RectProto app_bounds = 1;

  optional int32 windowing_mode = 2;

  optional int32 activity_type = 3;

core/proto/android/media/audioattributes.proto

+5 −1
Original line number Diff line number Diff line
@@ -20,15 +20,19 @@ option java_multiple_files = true; 


package android.media;



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



/**

 * An android.media.AudioAttributes object.

 */

message AudioAttributesProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional Usage usage = 1;

    optional ContentType content_type = 2;

    // Bit representation of set flags.

    optional int32 flags = 3;

    repeated string tags = 4;

    repeated string tags = 4 [ (android.privacy).dest = DEST_EXPLICIT ];

}



enum ContentType {

core/proto/android/server/forceappstandbytracker.proto

+3 −2
Original line number Diff line number Diff line
@@ -17,13 +17,12 @@ 
syntax = "proto2";



import "frameworks/base/core/proto/android/server/statlogger.proto";

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



package com.android.server;



option java_multiple_files = true;



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



// Dump from com.android.server.ForceAppStandbyTracker.

message ForceAppStandbyTrackerProto {

  option (.android.msg_privacy).dest = DEST_AUTOMATIC;
@@ -62,6 +61,8 @@ message ForceAppStandbyTrackerProto { 
  optional StatLoggerProto stats = 9;



  message ExemptedPackage {

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



    optional int32 userId = 1;

    optional string package_name = 2;

  }

core/proto/android/server/intentresolver.proto

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


package com.android.server;



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



message IntentResolverProto {

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





    message ArrayMapEntry {

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



        optional string key = 1;

        repeated string values = 2;

    }

core/proto/android/server/statlogger.proto

+4 −0
Original line number Diff line number Diff line
@@ -20,8 +20,12 @@ package com.android.server; 


option java_multiple_files = true;



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



// Dump from StatLogger.

message StatLoggerProto {

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



  message Event {

    optional int32 eventId = 1;

    optional string label = 2;