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

Commit 6f6ca499 authored by Issei Suzuki's avatar Issei Suzuki Committed by Android (Google) Code Review
Browse files

Merge changes I4c122bf5,Ib39200ac 

* changes:
  Clean up visibility related flags in ActivityRecord
  Clean up visibility related flags in WindowToken
parents af30a90e d4ee1cc9

core/proto/android/server/activitymanagerservice.proto

+2 −1
Original line number Diff line number Diff line
@@ -126,11 +126,12 @@ message ActivityRecordProto { 
    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 visible_requested = 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;

    optional bool visible = 9;

}



message KeyguardControllerProto {

core/proto/android/server/windowmanagerservice.proto

+3 −3
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ message AppWindowTokenProto { 
    optional bool fills_parent = 7;

    optional bool app_stopped = 8;

    optional bool visible_requested = 9;

    optional bool client_hidden = 10;

    optional bool client_visible = 10;

    optional bool defer_hiding_client = 11;

    optional bool reported_drawn = 12;

    optional bool reported_visible = 13;
@@ -249,8 +249,9 @@ message AppWindowTokenProto { 
    optional IdentifierProto starting_window = 19;

    optional bool starting_displayed = 20;

    optional bool starting_moved = 21;

    optional bool hidden_set_from_transferred_starting_window = 22;

    optional bool visible_set_from_transferred_starting_window = 22;

    repeated .android.graphics.RectProto frozen_bounds = 23;

    optional bool visible = 24;

}



/* represents WindowToken */
@@ -260,7 +261,6 @@ message WindowTokenProto { 
    optional WindowContainerProto window_container = 1;

    optional int32 hash_code = 2;

    repeated WindowStateProto windows = 3;

    optional bool hidden = 4;

    optional bool waiting_to_show = 5;

    optional bool paused = 6;

}

data/etc/services.core.protolog.json

+34 −34
Original line number Diff line number Diff line
@@ -55,6 +55,12 @@ 
      "group": "WM_DEBUG_REMOTE_ANIMATIONS",

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

    },

    "-2006946193": {

      "message": "setClientVisible: %s clientVisible=%b Callers=%s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS",

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

    },

    "-2002500255": {

      "message": "Defer removing snapshot surface in %dms",

      "level": "VERBOSE",
@@ -73,10 +79,10 @@ 
      "group": "WM_ERROR",

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

    },

    "-1972506791": {

      "message": "Set freezing of %s: hidden=%b freezing=%b visibleRequested=%b. %s",

      "level": "INFO",

      "group": "WM_DEBUG_ORIENTATION",

    "-1976550065": {

      "message": "commitVisibility: %s: visible=%b visibleRequested=%b",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS",

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

    },

    "-1963461591": {
@@ -85,12 +91,6 @@ 
      "group": "WM_DEBUG_ADD_REMOVE",

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

    },

    "-1958209312": {

      "message": "Clear freezing of %s: hidden=%b freezing=%b",

      "level": "VERBOSE",

      "group": "WM_DEBUG_ORIENTATION",

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

    },

    "-1953668890": {

      "message": "Can't start recents animation, nextAppTransition=%s",

      "level": "DEBUG",
@@ -307,12 +307,6 @@ 
      "group": "WM_DEBUG_ADD_REMOVE",

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

    },

    "-1456549051": {

      "message": "setClientHidden: %s clientHidden=%b Callers=%s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS",

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

    },

    "-1455600136": {

      "message": "Attempted to add Dream window with unknown token %s.  Aborting.",

      "level": "WARN",
@@ -547,12 +541,6 @@ 
      "group": "WM_DEBUG_STARTING_WINDOW",

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

    },

    "-931184679": {

      "message": "Changing app %s hidden=%b performLayout=%b",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS",

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

    },

    "-928291778": {

      "message": "applyAnimation: anim=%s nextAppTransition=%d transit=%s Callers=%s",

      "level": "VERBOSE",
@@ -841,6 +829,12 @@ 
      "group": "WM_DEBUG_APP_TRANSITIONS",

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

    },

    "-374767836": {

      "message": "setAppVisibility(%s, visible=%b): %s visible=%b mVisibleRequested=%b Callers=%s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS",

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

    },

    "-371630969": {

      "message": "New wallpaper target=%s, oldWallpaper=%s, openingApps=%s, closingApps=%s",

      "level": "VERBOSE",
@@ -883,12 +877,6 @@ 
      "group": "WM_DEBUG_ORIENTATION",

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

    },

    "-229838822": {

      "message": "setAppVisibility(%s, visible=%b): %s hidden=%b mVisibleRequested=%b Callers=%s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS",

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

    },

    "-198463978": {

      "message": "updateRotationUnchecked: alwaysSendConfiguration=%b forceRelayout=%b",

      "level": "VERBOSE",
@@ -1273,6 +1261,12 @@ 
      "group": "WM_DEBUG_SCREEN_ON",

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

    },

    "466506262": {

      "message": "Clear freezing of %s: visible=%b freezing=%b",

      "level": "VERBOSE",

      "group": "WM_DEBUG_ORIENTATION",

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

    },

    "474000473": {

      "message": "No stack above target stack=%s",

      "level": "DEBUG",
@@ -1483,6 +1477,12 @@ 
      "group": "WM_DEBUG_REMOTE_ANIMATIONS",

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

    },

    "841702299": {

      "message": "Changing app %s visible=%b performLayout=%b",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS",

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

    },

    "845234215": {

      "message": "App is requesting an orientation, return %d for display id=%d",

      "level": "VERBOSE",
@@ -1891,6 +1891,12 @@ 
      "group": "WM_DEBUG_STARTING_WINDOW",

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

    },

    "1746778201": {

      "message": "Set freezing of %s: visible=%b freezing=%b visibleRequested=%b. %s",

      "level": "INFO",

      "group": "WM_DEBUG_ORIENTATION",

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

    },

    "1747941491": {

      "message": "SURFACE controller=%s alpha=%f matrix=[%f*%f,%f*%f][%f*%f,%f*%f]: %s",

      "level": "INFO",
@@ -1987,12 +1993,6 @@ 
      "group": "WM_DEBUG_REMOTE_ANIMATIONS",

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

    },

    "1965198071": {

      "message": "commitVisibility: %s: hidden=%b visibleRequested=%b",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS",

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

    },

    "1984470582": {

      "message": "Creating TaskScreenshotAnimatable: task: %s width: %d height: %d",

      "level": "DEBUG",

services/core/java/com/android/server/wm/ActivityRecord.java

+70 −64

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/wm/AppTransitionController.java

+4 −3
Original line number Diff line number Diff line
@@ -688,15 +688,16 @@ public class AppTransitionController { 
     * compare z-order.

     *

     * @param apps The list of apps to search.

     * @param ignoreHidden If set to true, ignores apps that are {@link ActivityRecord#isHidden}.

     * @param ignoreInvisible If set to true, ignores apps that are not

     *                        {@link ActivityRecord#isVisible}.

     * @return The top {@link ActivityRecord}.

     */

    private ActivityRecord getTopApp(ArraySet<ActivityRecord> apps, boolean ignoreHidden) {

    private ActivityRecord getTopApp(ArraySet<ActivityRecord> apps, boolean ignoreInvisible) {

        int topPrefixOrderIndex = Integer.MIN_VALUE;

        ActivityRecord topApp = null;

        for (int i = apps.size() - 1; i >= 0; i--) {

            final ActivityRecord app = apps.valueAt(i);

            if (ignoreHidden && app.isHidden()) {

            if (ignoreInvisible && !app.isVisible()) {

                continue;

            }

            final int prefixOrderIndex = app.getPrefixOrderIndex();