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

Commit b344755f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix ProtoLogging calls" into main

parents 7a99085f 7e9a6dc2

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+2 −2
Original line number Diff line number Diff line
@@ -2335,8 +2335,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                    sideStageTopTaskId, splitBounds);

            if (added) {

                ProtoLog.d(WM_SHELL_SPLIT_SCREEN,

                        "updateRecentTasksSplitPair: adding split pair ltTask="

                                + leftTopTaskIds + " rbTask=" + rightBottomTaskIds);

                        "updateRecentTasksSplitPair: adding split pair ltTask=%s rbTask=%s",

                        leftTopTaskIds, rightBottomTaskIds);

            }

        });

    }

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

+4 −4
Original line number Diff line number Diff line
@@ -83,10 +83,10 @@ class AppCompatCameraStateStrategyForTask implements AppCompatCameraStateStrateg 
        }



        // TODO(b/423883666): Use `WM_DEBUG_CAMERA_COMPAT`.

        ProtoLog.v(WM_DEBUG_STATES, "CameraOpen: cameraApp=" + cameraApp

                + " cameraInfo.mPid=" + cameraAppInfo.mPid

                + " cameraTask=" + cameraActivity.getTask()

                + " cameraAppInfo.mTaskId=" + cameraAppInfo.mTaskId);

        ProtoLog.v(WM_DEBUG_STATES,

                "CameraOpen: cameraApp=%s cameraInfo.mPid=%d cameraTask=%s "

                        + "cameraAppInfo.mTaskId=%d",

                cameraApp, cameraAppInfo.mPid, cameraActivity.getTask(), cameraAppInfo.mTaskId);



        final boolean anyCameraAlreadyOpenForTask = mCameraAppInfoSet

                .containsAnyCameraForTaskId(cameraActivity.getTask().mTaskId);

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

+1 −1
Original line number Diff line number Diff line
@@ -404,6 +404,6 @@ class DesktopModeLaunchParamsModifier implements LaunchParamsModifier { 
    }



    private void outputLog() {

        ProtoLog.v(WmProtoLogGroups.WM_DEBUG_TASKS_LAUNCH_PARAMS, mLogBuilder.toString());

        ProtoLog.v(WmProtoLogGroups.WM_DEBUG_TASKS_LAUNCH_PARAMS, "%s", mLogBuilder.toString());

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { 
    }



    private void outputLog() {

        ProtoLog.v(WmProtoLogGroups.WM_DEBUG_TASKS_LAUNCH_PARAMS, mLogBuilder.toString());

        ProtoLog.v(WmProtoLogGroups.WM_DEBUG_TASKS_LAUNCH_PARAMS, "%s", mLogBuilder.toString());

    }



    private static int orientationFromBounds(Rect bounds) {

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

+4 −2
Original line number Diff line number Diff line
@@ -3118,8 +3118,10 @@ public class WindowManagerService extends IWindowManager.Stub 
                // registration in DisplayContent#onParentChanged at DisplayContent initialization.

                final DisplayContent dc = mRoot.getDisplayContent(displayId);

                if (dc == null) {

                    ProtoLog.w(WM_ERROR, "attachWindowContextToDisplayContent: trying"

                            + " to attach to a non-existing display:" + displayId);

                    ProtoLog.w(WM_ERROR,

                            "attachWindowContextToDisplayContent: "

                                    + "trying to attach to a non-existing display:%d",

                            displayId);

                    return null;

                }

                mWindowContextListenerController.registerWindowContainerListener(wpc, clientToken,