Snap for 9642788 from 0844ed8aef6c1766581a56b333d7905ab3a37c67 to udc-release (4ad5a55c) · Commits · e / os / android_frameworks_native

cmds/atrace/atrace.rc

+11 −1

Original line number	Diff line number	Diff line
		@@ -297,8 +297,18 @@ on late-init
		write /sys/kernel/debug/tracing/synthetic_events "rss_stat_throttled unsigned int mm_id; unsigned int curr; int member; long size"

		# allow creating event triggers
		chmod 0666 /sys/kernel/debug/tracing/events/kmem/rss_stat/trigger
		chmod 0666 /sys/kernel/tracing/events/kmem/rss_stat/trigger
		chmod 0666 /sys/kernel/debug/tracing/events/kmem/rss_stat/trigger

		# allow enabling rss_stat_throttled
		chmod 0666 /sys/kernel/tracing/events/synthetic/rss_stat_throttled/enable
		chmod 0666 /sys/kernel/debug/tracing/events/synthetic/rss_stat_throttled/enable

		on late-init && property:ro.boot.fastboot.boottrace=enabled
		setprop debug.atrace.tags.enableflags 802922
		setprop persist.traced.enable 0
		write /sys/kernel/debug/tracing/tracing_on 1
		write /sys/kernel/tracing/tracing_on 1

		on late-init && property:ro.boot.fastboot.boottrace=enabled
		setprop debug.atrace.tags.enableflags 802922

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@
		#include <binder/IBinder.h>
		#include <binder/Parcelable.h>
		#include <input/Input.h>
		#include <input/InputVerifier.h>
		#include <sys/stat.h>
		#include <ui/Transform.h>
		#include <utils/BitSet.h>
		@@ -444,6 +445,7 @@ public:

		private:
		std::shared_ptr<InputChannel> mChannel;
		InputVerifier mInputVerifier;
		};

		/*

0 → 100644

+49 −0

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

		#pragma once

		#include <input/Input.h>
		#include <map>

		namespace android {

		/*
		* Crash if the provided touch stream is inconsistent.
		*
		* TODO(b/211379801): Add support for hover events:
		* - No hover move without enter
		* - No touching pointers when hover enter
		* - No hovering pointers when touching
		* - Only 1 hovering pointer max
		*/
		class InputVerifier {
		public:
		InputVerifier(const std::string& name);

		void processMovement(int32_t deviceId, int32_t action, uint32_t pointerCount,
		const PointerProperties* pointerProperties,
		const PointerCoords* pointerCoords, int32_t flags);

		private:
		const std::string mName;
		std::map<int32_t /deviceId/, std::bitset<MAX_POINTER_ID + 1>> mTouchingPointerIdsByDevice;
		void ensureTouchingPointersMatch(int32_t deviceId, uint32_t pointerCount,
		const PointerProperties* pointerProperties,
		const char* action) const;
		};

		} // namespace android

+2 −1

Original line number	Diff line number	Diff line
		@@ -547,7 +547,8 @@ cc_library {
		// Do not expand the visibility.
		visibility: [
		":__subpackages__",
		"//packages/modules/Virtualization:__subpackages__",
		"//packages/modules/Virtualization/javalib/jni",
		"//packages/modules/Virtualization/vm_payload",
		"//device/google/cuttlefish/shared/minidroid:__subpackages__",
		],
		}

+0 −2