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

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

Merge "Add more privacy tags and disable procrank util figure out permission to run the command"

parents 17bdbab6 69040223

core/proto/android/content/intent.proto

+3 −3
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ message IntentProto { 
    optional string component = 7;

    optional string component = 7;

    optional string source_bounds = 8;

    optional string source_bounds = 8;

    optional string clip_data = 9 [ (.android.privacy).dest = DEST_EXPLICIT ];

    optional string clip_data = 9 [ (.android.privacy).dest = DEST_EXPLICIT ];

    optional string extras = 10;

    optional string extras = 10 [ (.android.privacy).dest = DEST_EXPLICIT ];

    optional int32 content_user_hint = 11;

    optional int32 content_user_hint = 11;

    optional string selector = 12;

    optional string selector = 12;

}

}

core/proto/android/os/incident.proto

+1 −1
Original line number Original line Diff line number Diff line
@@ -123,7 +123,7 @@ message IncidentProto { 




    // Linux services

    // Linux services

    optional Procrank procrank = 2000 [

    optional Procrank procrank = 2000 [

        (section).type = SECTION_COMMAND,

        (section).type = SECTION_NONE, // disable procrank until figure out permission

        (section).args = "/system/xbin/procrank"

        (section).args = "/system/xbin/procrank"

    ];

    ];

core/proto/android/os/powermanager.proto

+3 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ package android.os; 
option java_multiple_files = true;

option java_multiple_files = true;





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

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

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





message PowerManagerProto {

message PowerManagerProto {

    /* User activity events in PowerManager.java. */

    /* 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

    // WakeLock class in android.os.PowerManager, it is the one used by sdk

    message WakeLockProto {

    message WakeLockProto {

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



        optional string hex_string = 1;

        optional string hex_string = 1;

        optional bool held = 2;

        optional bool held = 2;

        optional int32 internal_count = 3;

        optional int32 internal_count = 3;

core/proto/android/os/worksource.proto

+8 −0
Original line number Original line Diff line number Diff line
@@ -17,15 +17,23 @@ 
syntax = "proto2";

syntax = "proto2";

package android.os;

package android.os;





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



option java_multiple_files = true;

option java_multiple_files = true;





message WorkSourceProto {

message WorkSourceProto {

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



    message WorkSourceContentProto {

    message WorkSourceContentProto {

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



        optional int32 uid = 1;

        optional int32 uid = 1;

        optional string name = 2;

        optional string name = 2;

    }

    }





    message WorkChain {

    message WorkChain {

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



      repeated WorkSourceContentProto nodes = 1;

      repeated WorkSourceContentProto nodes = 1;

    }

    }

core/proto/android/server/activitymanagerservice.proto

+7 −3
Original line number Original line Diff line number Diff line
@@ -130,6 +130,8 @@ message BroadcastProto { 
  repeated StickyBroadcastProto sticky_broadcasts = 4;

  repeated StickyBroadcastProto sticky_broadcasts = 4;





  message MainHandler {

  message MainHandler {

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



    optional string handler = 1;

    optional string handler = 1;

    optional .android.os.LooperProto looper = 2;

    optional .android.os.LooperProto looper = 2;

  }

  }
@@ -663,7 +665,7 @@ message ProcessesProto { 
    option (.android.msg_privacy).dest = DEST_AUTOMATIC;

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





    optional .android.os.PowerManagerInternalProto.Wakefulness wakefulness = 1;

    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 sleeping = 3;

    optional bool shutting_down = 4;

    optional bool shutting_down = 4;

    optional bool test_pss_mode = 5;

    optional bool test_pss_mode = 5;
@@ -671,7 +673,7 @@ message ProcessesProto { 
  optional SleepStatus sleep_status = 27;

  optional SleepStatus sleep_status = 27;





  message VoiceProto {

  message VoiceProto {

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

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





    optional string session = 1;

    optional string session = 1;

    optional .android.os.PowerManagerProto.WakeLockProto wakelock = 2;

    optional .android.os.PowerManagerProto.WakeLockProto wakelock = 2;
@@ -998,6 +1000,8 @@ message AppTimeTrackerProto { 
  optional int64 total_duration_ms = 2;

  optional int64 total_duration_ms = 2;





  message PackageTime {

  message PackageTime {

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



    optional string package = 1;

    optional string package = 1;

    optional int64 duration_ms = 2;

    optional int64 duration_ms = 2;

  }

  }