Merge "Add protologging on setRequestedVisibleTypes call" into main (41ea3dbc) · Commits · e / os / android_frameworks_base

core/java/android/view/InsetsController.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static android.view.InsetsControllerProto.CONTROL;
		import static android.view.InsetsControllerProto.STATE;
		import static android.view.InsetsSource.ID_IME;
		import static android.view.InsetsSource.ID_IME_CAPTION_BAR;
		import static android.view.ViewProtoLogGroups.IME_INSETS_CONTROLLER;
		import static android.view.WindowInsets.Type.FIRST;
		import static android.view.WindowInsets.Type.LAST;
		import static android.view.WindowInsets.Type.all;
		@@ -69,6 +70,7 @@ import android.view.inputmethod.InputMethodManager;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.inputmethod.ImeTracing;
		import com.android.internal.inputmethod.SoftInputShowHideReason;
		import com.android.internal.protolog.ProtoLog;
		import com.android.internal.util.function.TriFunction;

		import java.io.PrintWriter;
		@@ -1920,6 +1922,8 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
		final @InsetsType int requestedVisibleTypes =
		(mRequestedVisibleTypes & ~mask) \| (visibleTypes & mask);
		if (mRequestedVisibleTypes != requestedVisibleTypes) {
		ProtoLog.d(IME_INSETS_CONTROLLER, "Setting requestedVisibleTypes to %d (was %d)",
		requestedVisibleTypes, mRequestedVisibleTypes);
		mRequestedVisibleTypes = requestedVisibleTypes;
		}
		}

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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.
		*/

		package android.view;

		import android.annotation.NonNull;
		import android.view.inputmethod.Flags;

		import com.android.internal.protolog.ProtoLogGroup;

		import java.util.UUID;

		/**
		* Defines logging groups for ProtoLog.
		*
		* This file is used by the ProtoLogTool to generate optimized logging code. All of its dependencies
		* must be included in services.core.wm.protologgroups build target.
		*
		* @hide
		*/
		final class ViewProtoLogGroups {
		final static ProtoLogGroup IME_INSETS_CONTROLLER = new ProtoLogGroup(
		"IME_INSETS_CONTROLLER", "InsetsController", Flags.refactorInsetsController());

		final static ProtoLogGroup[] ALL_GROUPS = {
		IME_INSETS_CONTROLLER
		};
		}

+12 −0

Original line number	Diff line number	Diff line
		@@ -279,6 +279,7 @@ import com.android.internal.os.IResultReceiver;
		import com.android.internal.os.SomeArgs;
		import com.android.internal.policy.DecorView;
		import com.android.internal.policy.PhoneFallbackEventHandler;
		import com.android.internal.protolog.ProtoLog;
		import com.android.internal.util.FastPrintWriter;
		import com.android.internal.view.BaseSurfaceHolder;
		import com.android.internal.view.RootViewSurfaceTaker;
		@@ -1282,6 +1283,8 @@ public final class ViewRootImpl implements ViewParent,
		mIsStylusPointerIconEnabled =
		InputSettings.isStylusPointerIconEnabled(mContext);

		initializeProtoLogInProcess();

		String processorOverrideName = context.getResources().getString(
		R.string.config_inputEventCompatProcessorOverrideClassName);
		if (processorOverrideName.isEmpty()) {
		@@ -13403,4 +13406,13 @@ public final class ViewRootImpl implements ViewParent,

		mCurrentColorMode = colorMode;
		}

		private static boolean sProtoLogInitialized = false;

		private void initializeProtoLogInProcess() {
		if (!sProtoLogInitialized) {
		ProtoLog.init(ViewProtoLogGroups.ALL_GROUPS);
		sProtoLogInitialized = true;
		}
		}
		}