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

Commit da8b827e authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Unify Activity level of window hierarchy (50/n). 

Make ActivityRecord extend AppWindowToken so we have a single object
for acitvities in the hierarchy.

Bug: 80414790
Test: Existing tests pass.
Change-Id: Ia7f52ef444cba88223f4e8a9586f6c12b1b5e4ea
parent b5a99eda

core/proto/android/server/activitymanagerservice.proto

+3 −1
Original line number Diff line number Diff line
@@ -118,13 +118,15 @@ message TaskRecordProto { 
message ActivityRecordProto {

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



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

    // To be removed soon.

    optional .com.android.server.wm.ConfigurationContainerProto configuration_container = 1 [deprecated=true];

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

    optional string state = 3;

    optional bool visible = 4;

    optional bool front_of_task = 5;

    optional int32 proc_id = 6;

    optional bool translucent = 7;

    optional .com.android.server.wm.AppWindowTokenProto app_window_token = 8;

}



message KeyguardControllerProto {

data/etc/services.core.protolog.json

+6 −6
Original line number Diff line number Diff line
@@ -823,6 +823,12 @@ 
      "group": "WM_DEBUG_ORIENTATION",

      "at": "com\/android\/server\/wm\/DisplayRotation.java"

    },

    "-415912575": {

      "message": "setTask: %s at top.",

      "level": "VERBOSE",

      "group": "WM_DEBUG_ADD_REMOVE",

      "at": "com\/android\/server\/wm\/ActivityRecord.java"

    },

    "-415865166": {

      "message": "findFocusedWindow: Found new focus @ %s",

      "level": "VERBOSE",
@@ -925,12 +931,6 @@ 
      "group": "WM_DEBUG_APP_TRANSITIONS",

      "at": "com\/android\/server\/wm\/WindowState.java"

    },

    "-117925665": {

      "message": "addAppToken: %s task=%s at %d",

      "level": "VERBOSE",

      "group": "WM_DEBUG_ADD_REMOVE",

      "at": "com\/android\/server\/wm\/ActivityRecord.java"

    },

    "-116086365": {

      "message": "******************** ENABLING SCREEN!",

      "level": "INFO",