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

Commit 69040223 authored by Yi Jin's avatar Yi Jin
Browse files

Add more privacy tags and disable procrank util figure out permission to 

run the command

Test: manually flushed to device and run
out/host/linux-x86/bin/incident_report -w -p <A/E/L> <section>

Change-Id: I7c1b6bc03a26de95cb2397d8d653b3b9b3c0e103
parent eb576da4

core/proto/android/content/intent.proto

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

    optional string source_bounds = 8;

    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 string selector = 12;

}

core/proto/android/os/incident.proto

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


    // Linux services

    optional Procrank procrank = 2000 [

        (section).type = SECTION_COMMAND,

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

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

    ];

core/proto/android/os/powermanager.proto

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



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

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



message PowerManagerProto {

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

    message WakeLockProto {

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



        optional string hex_string = 1;

        optional bool held = 2;

        optional int32 internal_count = 3;

core/proto/android/os/worksource.proto

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

package android.os;



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



option java_multiple_files = true;



message WorkSourceProto {

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



    message WorkSourceContentProto {

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



        optional int32 uid = 1;

        optional string name = 2;

    }



    message WorkChain {

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



      repeated WorkSourceContentProto nodes = 1;

    }

core/proto/android/server/activitymanagerservice.proto

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



  message MainHandler {

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



    optional string handler = 1;

    optional .android.os.LooperProto looper = 2;

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



    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 shutting_down = 4;

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



  message VoiceProto {

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

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



    optional string session = 1;

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



  message PackageTime {

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



    optional string package = 1;

    optional int64 duration_ms = 2;

  }