Snap for 11733120 from 8be726605023df669359c4b5148cdc6bf874b34b to 24Q3-release (7f1cb62b) · Commits · e / os / android_frameworks_native

data/etc/Android.bp

+0 −6

Original line number	Diff line number	Diff line
		@@ -376,12 +376,6 @@ prebuilt_etc {
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.software.contextualsearch.prebuilt.xml",
		src: "android.software.contextualsearch.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.software.device_id_attestation.prebuilt.xml",
		src: "android.software.device_id_attestation.xml",

data/etc/android.software.contextualsearch.xml

deleted100644 → 0

+0 −20

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2018 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.
		-->

		<!-- Feature for devices supporting contextual search helper. -->
		<permissions>
		<feature name="android.software.contextualsearch" />
		</permissions>

libs/input/Android.bp

+1 −48

Original line number	Diff line number	Diff line
		@@ -249,6 +249,7 @@ cc_library {
		"libcutils",
		"liblog",
		"libPlatformProperties",
		"libstatslog",
		"libtinyxml2",
		"libutils",
		"libz", // needed by libkernelconfigs
		@@ -289,17 +290,6 @@ cc_library {

		target: {
		android: {
		export_shared_lib_headers: ["libbinder"],

		shared_libs: [
		"libutils",
		"libbinder",
		// Stats logging library and its dependencies.
		"libstatslog_libinput",
		"libstatsbootstrap",
		"android.os.statsbootstrap_aidl-cpp",
		],

		required: [
		"motion_predictor_model_prebuilt",
		"motion_predictor_model_config",
		@@ -314,43 +304,6 @@ cc_library {
		},
		}

		// Use bootstrap version of stats logging library.
		// libinput is a bootstrap process (starts early in the boot process), and thus can't use the normal
		// `libstatslog` because that requires `libstatssocket`, which is only available later in the boot.
		cc_library {
		name: "libstatslog_libinput",
		generated_sources: ["statslog_libinput.cpp"],
		generated_headers: ["statslog_libinput.h"],
		export_generated_headers: ["statslog_libinput.h"],
		shared_libs: [
		"libbinder",
		"libstatsbootstrap",
		"libutils",
		"android.os.statsbootstrap_aidl-cpp",
		],
		}

		genrule {
		name: "statslog_libinput.h",
		tools: ["stats-log-api-gen"],
		cmd: "$(location stats-log-api-gen) --header $(genDir)/statslog_libinput.h --module libinput" +
		" --namespace android,stats,libinput --bootstrap",
		out: [
		"statslog_libinput.h",
		],
		}

		genrule {
		name: "statslog_libinput.cpp",
		tools: ["stats-log-api-gen"],
		cmd: "$(location stats-log-api-gen) --cpp $(genDir)/statslog_libinput.cpp --module libinput" +
		" --namespace android,stats,libinput --importHeader statslog_libinput.h" +
		" --bootstrap",
		out: [
		"statslog_libinput.cpp",
		],
		}

		cc_defaults {
		name: "libinput_fuzz_defaults",
		cpp_std: "c++20",

libs/input/MotionPredictorMetricsManager.cpp

+13 −20

Original line number	Diff line number	Diff line
		@@ -21,14 +21,11 @@
		#include <algorithm>

		#include <android-base/logging.h>
		#include <statslog.h>

		#include "Eigen/Core"
		#include "Eigen/Geometry"

		#ifdef __ANDROID__
		#include <statslog_libinput.h>
		#endif

		namespace android {
		namespace {

		@@ -48,10 +45,7 @@ inline constexpr float PATH_LENGTH_EPSILON = 0.001;

		void MotionPredictorMetricsManager::defaultReportAtomFunction(
		const MotionPredictorMetricsManager::AtomFields& atomFields) {
		// Call stats_write logging function only on Android targets (not supported on host).
		#ifdef __ANDROID__
		android::stats::libinput::
		stats_write(android::stats::libinput::STYLUS_PREDICTION_METRICS_REPORTED,
		android::util::stats_write(android::util::STYLUS_PREDICTION_METRICS_REPORTED,
		/stylus_vendor_id=/0,
		/stylus_product_id=/0,
		atomFields.deltaTimeBucketMilliseconds,
		@@ -63,7 +57,6 @@ void MotionPredictorMetricsManager::defaultReportAtomFunction(
		atomFields.highVelocityOffTrajectoryRmse,
		atomFields.scaleInvariantAlongTrajectoryRmse,
		atomFields.scaleInvariantOffTrajectoryRmse);
		#endif
		}

		MotionPredictorMetricsManager::MotionPredictorMetricsManager(

libs/input/rust/input.rs

+2 −0

Original line number	Diff line number	Diff line
		@@ -194,6 +194,8 @@ bitflags! {
		input_bindgen::AMOTION_EVENT_FLAG_IS_ACCESSIBILITY_EVENT;
		/// FLAG_NO_FOCUS_CHANGE
		const NO_FOCUS_CHANGE = input_bindgen::AMOTION_EVENT_FLAG_NO_FOCUS_CHANGE;
		/// FLAG_IS_GENERATED_GESTURE
		const IS_GENERATED_GESTURE = input_bindgen::AMOTION_EVENT_FLAG_IS_GENERATED_GESTURE;
		}
		}