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

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

Merge "Remove am/wm.proto which is redundant. The naming convention is defined... 

Merge "Remove am/wm.proto which is redundant. The naming convention is defined in core/proto/README.md" into pi-dev
parents b1223f45 6c6e9cab

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ import com.android.internal.util.ArrayUtils; 
import com.android.internal.util.FastPrintWriter;

import com.android.org.conscrypt.OpenSSLSocketImpl;

import com.android.org.conscrypt.TrustedCertificateStore;

import com.android.server.am.proto.MemInfoDumpProto;

import com.android.server.am.MemInfoDumpProto;



import dalvik.system.BaseDexClassLoader;

import dalvik.system.CloseGuard;

core/proto/android/os/incident.proto

+6 −6
Original line number Diff line number Diff line
@@ -231,22 +231,22 @@ message IncidentProto { 
        (section).args = "procstats --proto"

    ];



    optional com.android.server.am.proto.ActivityManagerServiceDumpActivitiesProto activities = 3012 [

    optional com.android.server.am.ActivityManagerServiceDumpActivitiesProto activities = 3012 [

        (section).type = SECTION_DUMPSYS,

        (section).args = "activity --proto activities"

    ];



    optional com.android.server.am.proto.ActivityManagerServiceDumpBroadcastsProto broadcasts = 3013 [

    optional com.android.server.am.ActivityManagerServiceDumpBroadcastsProto broadcasts = 3013 [

        (section).type = SECTION_DUMPSYS,

        (section).args = "activity --proto broadcasts"

    ];



    optional com.android.server.am.proto.ActivityManagerServiceDumpServicesProto amservices = 3014 [

    optional com.android.server.am.ActivityManagerServiceDumpServicesProto amservices = 3014 [

        (section).type = SECTION_DUMPSYS,

        (section).args = "activity --proto service"

    ];



    optional com.android.server.am.proto.ActivityManagerServiceDumpProcessesProto amprocesses = 3015 [

    optional com.android.server.am.ActivityManagerServiceDumpProcessesProto amprocesses = 3015 [

        (section).type = SECTION_DUMPSYS,

        (section).args = "activity --proto processes"

    ];
@@ -256,12 +256,12 @@ message IncidentProto { 
        (section).args = "alarm --proto"

    ];



    optional com.android.server.wm.proto.WindowManagerServiceDumpProto window = 3017 [

    optional com.android.server.wm.WindowManagerServiceDumpProto window = 3017 [

        (section).type = SECTION_DUMPSYS,

        (section).args = "window --proto"

    ];



    optional com.android.server.am.proto.MemInfoDumpProto meminfo = 3018 [

    optional com.android.server.am.MemInfoDumpProto meminfo = 3018 [

        (section).type = SECTION_DUMPSYS,

        (section).args = "meminfo -a --proto"

    ];

core/proto/android/server/activitymanagerservice.proto

+24 −22
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


syntax = "proto2";



package com.android.server.am.proto;

package com.android.server.am;



import "frameworks/base/core/proto/android/app/activitymanager.proto";

import "frameworks/base/core/proto/android/app/enums.proto";
@@ -59,11 +59,11 @@ message ActivityManagerServiceDumpActivitiesProto { 
message ActivityStackSupervisorProto {

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



  optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;

  optional .com.android.server.wm.ConfigurationContainerProto configuration_container = 1;

  repeated ActivityDisplayProto displays = 2;

  optional KeyguardControllerProto keyguard_controller = 3;

  optional int32 focused_stack_id = 4;

  optional .com.android.server.wm.proto.IdentifierProto resumed_activity = 5;

  optional .com.android.server.wm.IdentifierProto resumed_activity = 5;

  // Whether or not the home activity is the recents activity. This is needed for the CTS tests to

  // know what activity types to check for when invoking splitscreen multi-window.

  optional bool is_home_recents_component = 6;
@@ -73,7 +73,7 @@ message ActivityStackSupervisorProto { 
message ActivityDisplayProto {

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



  optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;

  optional .com.android.server.wm.ConfigurationContainerProto configuration_container = 1;

  optional int32 id = 2;

  repeated ActivityStackProto stacks = 3;

}
@@ -81,10 +81,10 @@ message ActivityDisplayProto { 
message ActivityStackProto {

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



  optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;

  optional .com.android.server.wm.ConfigurationContainerProto configuration_container = 1;

  optional int32 id = 2;

  repeated TaskRecordProto tasks = 3;

  optional .com.android.server.wm.proto.IdentifierProto resumed_activity = 4;

  optional .com.android.server.wm.IdentifierProto resumed_activity = 4;

  optional int32 display_id = 5;

  optional bool fullscreen = 6;

  optional .android.graphics.RectProto bounds = 7;
@@ -93,7 +93,7 @@ message ActivityStackProto { 
message TaskRecordProto {

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



  optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;

  optional .com.android.server.wm.ConfigurationContainerProto configuration_container = 1;

  optional int32 id = 2;

  repeated ActivityRecordProto activities = 3;

  optional int32 stack_id = 4;
@@ -111,8 +111,8 @@ message TaskRecordProto { 
message ActivityRecordProto {

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



  optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;

  optional .com.android.server.wm.proto.IdentifierProto identifier = 2;

  optional .com.android.server.wm.ConfigurationContainerProto configuration_container = 1;

  optional .com.android.server.wm.IdentifierProto identifier = 2;

  optional string state = 3;

  optional bool visible = 4;

  optional bool front_of_task = 5;
@@ -689,25 +689,14 @@ message ActivityManagerServiceDumpProcessesProto { 
  }

  optional SleepStatus sleep_status = 27;



  message VoiceProto {

  message Voice {

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



    optional string session = 1;

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

  }

  optional VoiceProto running_voice = 28;

  optional Voice running_voice = 28;



  message VrControllerProto {

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



    enum VrMode {

      FLAG_NON_VR_MODE = 0;

      FLAG_VR_MODE = 1;

      FLAG_PERSISTENT_VR_MODE = 2;

    }

    repeated VrMode vr_mode = 1;

    optional int32 render_thread_id = 2;

  }

  optional VrControllerProto vr_controller = 29;



  message DebugApp {
@@ -854,6 +843,19 @@ message ImportanceTokenProto { 
  optional string reason = 3;

}



// proto of class VrController.java

message VrControllerProto {

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



  enum VrMode {

    FLAG_NON_VR_MODE = 0;

    FLAG_VR_MODE = 1;

    FLAG_PERSISTENT_VR_MODE = 2;

  }

  repeated VrMode vr_mode = 1;

  optional int32 render_thread_id = 2;

}



message ProcessOomProto {

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

core/proto/android/server/animationadapter.proto

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import "frameworks/base/core/proto/android/graphics/point.proto"; 
import "frameworks/base/core/proto/android/view/remote_animation_target.proto";

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



package com.android.server.wm.proto;

package com.android.server.wm;

option java_multiple_files = true;



message AnimationAdapterProto {

core/proto/android/server/appwindowthumbnail.proto

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ syntax = "proto2"; 
import "frameworks/base/core/proto/android/server/surfaceanimator.proto";

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



package com.android.server.wm.proto;

package com.android.server.wm;

option java_multiple_files = true;



/**