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

Commit e8d84ab0 authored by Garfield Tan's avatar Garfield Tan
Browse files

Merge AppWindowToken into ActivityRecord 

This change kept AppWindowTokenTests as it's originally based on top of
WindowTestBase, and merging that into ActivityRecordTests needs to
change the base class to ActivityTestBase, which requires additional
work and may change test behaviors. Therefore delay that to
follow-up CL.

Bug: 80414790
Test: Existing tests pass.
Change-Id: I6d73975ee77be9817c41b297f067de2d92a68499
parent 9d85e0f3

core/java/android/app/ITaskStackListener.aidl

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ oneway interface ITaskStackListener { 
     * @param activityToken Token of the size compatibility mode activity. It will be null when

     *                      switching to a activity that is not in size compatibility mode or the

     *                      configuration of the activity.

     * @see com.android.server.wm.AppWindowToken#inSizeCompatMode

     * @see com.android.server.wm.ActivityRecord#inSizeCompatMode

     */

    void onSizeCompatModeActivityChanged(int displayId, in IBinder activityToken);

data/etc/services.core.protolog.json

+4 −1759

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ final class AccessibilityController { 
            }



            private Region getLetterboxBounds(WindowState windowState) {

                final AppWindowToken appToken = windowState.mAppToken;

                final ActivityRecord appToken = windowState.mActivityRecord;

                if (appToken == null) {

                    return new Region();

                }

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

+2 −2
Original line number Diff line number Diff line
@@ -1294,14 +1294,14 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack> { 
        if (mDisplayContent == null) {

            return;

        }

        final AppWindowToken newFocus;

        final ActivityRecord newFocus;

        final IBinder token = r.appToken;

        if (token == null) {

            ProtoLog.v(WM_DEBUG_FOCUS_LIGHT, "Clearing focused app, displayId=%d",

                    mDisplayId);

            newFocus = null;

        } else {

            newFocus = mService.mWindowManager.mRoot.getAppWindowToken(token);

            newFocus = mService.mWindowManager.mRoot.getActivityRecord(token);

            if (newFocus == null) {

                Slog.w(TAG_WM, "Attempted to set focus to non-existing app token: " + token

                        + ", displayId=" + mDisplayId);

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

+4314 −1014

File changed.

Preview size limit exceeded, changes collapsed.