Merge "Block untrusted touches in InputDispatcher" (7dee71f4) · Commits · e / os / platform_frameworks_native

include/input/InputWindow.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#ifndef _UI_INPUT_WINDOW_H
		#define _UI_INPUT_WINDOW_H

		#include <android/os/TouchOcclusionMode.h>
		#include <binder/Parcel.h>
		#include <binder/Parcelable.h>
		#include <input/Flags.h>
		@@ -30,6 +31,8 @@

		#include "InputApplication.h"

		using android::os::TouchOcclusionMode;

		namespace android {

		/*
		@@ -158,6 +161,10 @@ struct InputWindowInfo : public Parcelable {
		// in scaling of the TOUCH_MAJOR/TOUCH_MINOR axis.
		float globalScaleFactor = 1.0f;

		// The opacity of this window, from 0.0 to 1.0 (inclusive).
		// An alpha of 1.0 means fully opaque and 0.0 means fully transparent.
		float alpha;

		// Transform applied to individual windows.
		ui::Transform transform;

		@@ -176,8 +183,10 @@ struct InputWindowInfo : public Parcelable {
		* motion events to be delivered to them with AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED.
		*/
		bool trustedOverlay = false;
		TouchOcclusionMode touchOcclusionMode = TouchOcclusionMode::BLOCK_UNTRUSTED;
		int32_t ownerPid = -1;
		int32_t ownerUid = -1;
		std::string packageName;
		Flags<Feature> inputFeatures;
		int32_t displayId = ADISPLAY_ID_NONE;
		int32_t portalToDisplayId = ADISPLAY_ID_NONE;

libs/input/Android.bp

+6 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@ filegroup {
		name: "inputconstants_aidl",
		srcs: [
		"android/os/IInputConstants.aidl",
		"android/os/TouchOcclusionMode.aidl",
		"android/os/BlockUntrustedTouchesMode.aidl",
		],
		}

		@@ -71,10 +73,14 @@ cc_library {
		"android/FocusRequest.aidl",
		"android/InputApplicationInfo.aidl",
		"android/os/IInputConstants.aidl",
		"android/os/TouchOcclusionMode.aidl",
		"android/os/BlockUntrustedTouchesMode.aidl",
		"android/os/IInputFlinger.aidl",
		"android/os/ISetInputWindowsListener.aidl",
		],

		export_shared_lib_headers: ["libbinder"],

		shared_libs: [
		"libutils",
		"libbinder",

libs/input/InputWindow.cpp

+15 −5

Original line number	Diff line number	Diff line
		@@ -59,10 +59,11 @@ bool InputWindowInfo::operator==(const InputWindowInfo& info) const {
		info.surfaceInset == surfaceInset && info.globalScaleFactor == globalScaleFactor &&
		info.transform == transform && info.touchableRegion.hasSameRects(touchableRegion) &&
		info.visible == visible && info.trustedOverlay == trustedOverlay &&
		info.focusable == focusable && info.hasWallpaper == hasWallpaper &&
		info.paused == paused && info.ownerPid == ownerPid && info.ownerUid == ownerUid &&
		info.inputFeatures == inputFeatures && info.displayId == displayId &&
		info.portalToDisplayId == portalToDisplayId &&
		info.focusable == focusable && info.touchOcclusionMode == touchOcclusionMode &&
		info.hasWallpaper == hasWallpaper && info.paused == paused &&
		info.ownerPid == ownerPid && info.ownerUid == ownerUid &&
		info.packageName == packageName && info.inputFeatures == inputFeatures &&
		info.displayId == displayId && info.portalToDisplayId == portalToDisplayId &&
		info.replaceTouchableRegionWithCrop == replaceTouchableRegionWithCrop &&
		info.applicationInfo == applicationInfo;
		}
		@@ -91,6 +92,7 @@ status_t InputWindowInfo::writeToParcel(android::Parcel* parcel) const {
		parcel->writeInt32(frameBottom) ?:
		parcel->writeInt32(surfaceInset) ?:
		parcel->writeFloat(globalScaleFactor) ?:
		parcel->writeFloat(alpha) ?:
		parcel->writeFloat(transform.dsdx()) ?:
		parcel->writeFloat(transform.dtdx()) ?:
		parcel->writeFloat(transform.tx()) ?:
		@@ -102,8 +104,10 @@ status_t InputWindowInfo::writeToParcel(android::Parcel* parcel) const {
		parcel->writeBool(hasWallpaper) ?:
		parcel->writeBool(paused) ?:
		parcel->writeBool(trustedOverlay) ?:
		parcel->writeInt32(static_cast<int32_t>(touchOcclusionMode)) ?:
		parcel->writeInt32(ownerPid) ?:
		parcel->writeInt32(ownerUid) ?:
		parcel->writeUtf8AsUtf16(packageName) ?:
		parcel->writeInt32(inputFeatures.get()) ?:
		parcel->writeInt32(displayId) ?:
		parcel->writeInt32(portalToDisplayId) ?:
		@@ -134,6 +138,7 @@ status_t InputWindowInfo::readFromParcel(const android::Parcel* parcel) {
		flags = Flags<Flag>(parcel->readInt32());
		type = static_cast<Type>(parcel->readInt32());
		float dsdx, dtdx, tx, dtdy, dsdy, ty;
		int32_t touchOcclusionModeInt;
		// clang-format off
		status = parcel->readInt32(&frameLeft) ?:
		parcel->readInt32(&frameTop) ?:
		@@ -141,6 +146,7 @@ status_t InputWindowInfo::readFromParcel(const android::Parcel* parcel) {
		parcel->readInt32(&frameBottom) ?:
		parcel->readInt32(&surfaceInset) ?:
		parcel->readFloat(&globalScaleFactor) ?:
		parcel->readFloat(&alpha) ?:
		parcel->readFloat(&dsdx) ?:
		parcel->readFloat(&dtdx) ?:
		parcel->readFloat(&tx) ?:
		@@ -152,14 +158,18 @@ status_t InputWindowInfo::readFromParcel(const android::Parcel* parcel) {
		parcel->readBool(&hasWallpaper) ?:
		parcel->readBool(&paused) ?:
		parcel->readBool(&trustedOverlay) ?:
		parcel->readInt32(&touchOcclusionModeInt) ?:
		parcel->readInt32(&ownerPid) ?:
		parcel->readInt32(&ownerUid);
		parcel->readInt32(&ownerUid) ?:
		parcel->readUtf8FromUtf16(&packageName);
		// clang-format on

		if (status != OK) {
		return status;
		}

		touchOcclusionMode = static_cast<TouchOcclusionMode>(touchOcclusionModeInt);

		inputFeatures = Flags<Feature>(parcel->readInt32());
		status = parcel->readInt32(&displayId) ?:
		parcel->readInt32(&portalToDisplayId) ?:

libs/input/android/os/BlockUntrustedTouchesMode.aidl

0 → 100644

+35 −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.
		*/

		package android.os;


		/**
		* Block untrusted touches feature mode.
		*
		* @hide
		*/
		@Backing(type="int")
		enum BlockUntrustedTouchesMode {
		/** Feature is off. */
		DISABLED,

		/** Untrusted touches are flagged but not blocked. */
		PERMISSIVE,

		/** Untrusted touches are blocked. */
		BLOCK
		}

libs/input/android/os/TouchOcclusionMode.aidl

0 → 100644

+47 −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.
		*/

		package android.os;


		/**
		* Touch occlusion modes: These modes represent how windows are taken into
		* consideration in order to decide whether to block obscured touches or
		* not.
		*
		* @hide
		*/
		@Backing(type="int")
		enum TouchOcclusionMode {
		/**
		* Touches that pass through this window will be blocked if they are
		* consumed by a different UID and this window is not trusted.
		*/
		BLOCK_UNTRUSTED,

		/**
		* The window's opacity will be taken into consideration for touch
		* occlusion rules if the touch passes through it and the window is not
		* trusted.
		*/
		USE_OPACITY,

		/**
		* The window won't count for touch occlusion rules if the touch passes
		* through it.
		*/
		ALLOW
		}