Merge "Extending SysUI proto dump to WMShell" (cf259d52) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/Android.bp

+11 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,16 @@ genrule {
		}
		// End ProtoLog

		java_library {
		name: "WindowManager-Shell-proto",

		srcs: ["proto/*.proto"],

		proto: {
		type: "nano",
		},
		}

		android_library {
		name: "WindowManager-Shell",
		srcs: [
		@@ -94,6 +104,7 @@ android_library {
		],
		static_libs: [
		"protolog-lib",
		"WindowManager-Shell-proto",
		],
		manifest: "AndroidManifest.xml",
		}
		No newline at end of file

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		syntax = "proto2";

		package com.android.wm.shell;

		option java_multiple_files = true;

		message WmShellTraceProto {

		// Not used, just a test value
		optional bool test_value = 1;
		}

+4 −0

+1 −1

Original line number	Diff line number	Diff line
		@@ -584,7 +584,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
		}
		}

		Dependency.get(ProtoTracer.class).update();
		Dependency.get(ProtoTracer.class).scheduleFrameUpdate();
		}

		private void updateDisabledForQuickstep() {

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		syntax = "proto2";

		import "frameworks/base/libs/WindowManager/Shell/proto/wm_shell_trace.proto";

		package com.android.systemui.tracing;

		option java_multiple_files = true;
		@@ -23,6 +25,7 @@ option java_multiple_files = true;
		message SystemUiTraceProto {

		optional EdgeBackGestureHandlerProto edge_back_gesture_handler = 1;
		optional com.android.wm.shell.WmShellTraceProto wm_shell = 2;
		}

		message EdgeBackGestureHandlerProto {