Snap for 7163567 from a8109d468ad5beb766e385ae213398ad0c97c23b to sc-release (2a26e9d8) · Commits · e / os / android_frameworks_native

aidl/gui/android/hardware/display/IDeviceProductInfoConstants.aidl

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2021 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.hardware.display;

		/** @hide */
		interface IDeviceProductInfoConstants {
		/** The device connection to the display sink is unknown. */
		const int CONNECTION_TO_SINK_UNKNOWN = 0;

		/** The device is built-in in the display sink. */
		const int CONNECTION_TO_SINK_BUILT_IN = 1;

		/** The device is directly connected to the display sink. */
		const int CONNECTION_TO_SINK_DIRECT = 2;

		/** The device is transitively connected to the display sink. */
		const int CONNECTION_TO_SINK_TRANSITIVE = 3;
		}
		No newline at end of file

cmds/idlcli/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,8 @@ cc_library {
		"vibrator/CommandGetCompositionDelayMax.cpp",
		"vibrator/CommandGetCompositionSizeMax.cpp",
		"vibrator/CommandGetPrimitiveDuration.cpp",
		"vibrator/CommandGetQFactor.cpp",
		"vibrator/CommandGetResonantFrequency.cpp",
		"vibrator/CommandGetSupportedAlwaysOnEffects.cpp",
		"vibrator/CommandGetSupportedEffects.cpp",
		"vibrator/CommandGetSupportedPrimitives.cpp",

cmds/idlcli/vibrator/CommandGetQFactor.cpp

0 → 100644

+69 −0

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

		#include "utils.h"
		#include "vibrator.h"

		namespace android {
		namespace idlcli {

		class CommandVibrator;

		namespace vibrator {

		class CommandGetQFactor : public Command {
		std::string getDescription() const override { return "Retrieves vibrator Q factor."; }

		std::string getUsageSummary() const override { return ""; }

		UsageDetails getUsageDetails() const override {
		UsageDetails details{};
		return details;
		}

		Status doArgs(Args &args) override {
		if (!args.empty()) {
		std::cerr << "Unexpected Arguments!" << std::endl;
		return USAGE;
		}
		return OK;
		}

		Status doMain(Args && /args/) override {
		std::string statusStr;
		float qFactor;
		Status ret;

		if (auto hal = getHal<aidl::IVibrator>()) {
		auto status = hal->call(&aidl::IVibrator::getQFactor, &qFactor);
		statusStr = status.getDescription();
		ret = status.isOk() ? OK : ERROR;
		} else {
		return UNAVAILABLE;
		}

		std::cout << "Status: " << statusStr << std::endl;
		std::cout << "Q Factor: " << qFactor << std::endl;

		return ret;
		}
		};

		static const auto Command =
		CommandRegistry<CommandVibrator>::Register<CommandGetQFactor>("getQFactor");

		} // namespace vibrator
		} // namespace idlcli
		} // namespace android

cmds/idlcli/vibrator/CommandGetResonantFrequency.cpp

0 → 100644

+71 −0

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

		#include "utils.h"
		#include "vibrator.h"

		namespace android {
		namespace idlcli {

		class CommandVibrator;

		namespace vibrator {

		class CommandGetResonantFrequency : public Command {
		std::string getDescription() const override {
		return "Retrieves vibrator resonant frequency in Hz.";
		}

		std::string getUsageSummary() const override { return ""; }

		UsageDetails getUsageDetails() const override {
		UsageDetails details{};
		return details;
		}

		Status doArgs(Args &args) override {
		if (!args.empty()) {
		std::cerr << "Unexpected Arguments!" << std::endl;
		return USAGE;
		}
		return OK;
		}

		Status doMain(Args && /args/) override {
		std::string statusStr;
		float resonantFrequencyHz;
		Status ret;

		if (auto hal = getHal<aidl::IVibrator>()) {
		auto status = hal->call(&aidl::IVibrator::getResonantFrequency, &resonantFrequencyHz);
		statusStr = status.getDescription();
		ret = status.isOk() ? OK : ERROR;
		} else {
		return UNAVAILABLE;
		}

		std::cout << "Status: " << statusStr << std::endl;
		std::cout << "Resonant Frequency: " << resonantFrequencyHz << " Hz" << std::endl;

		return ret;
		}
		};

		static const auto Command = CommandRegistry<CommandVibrator>::Register<CommandGetResonantFrequency>(
		"getResonantFrequency");

		} // namespace vibrator
		} // namespace idlcli
		} // namespace android

cmds/surfacereplayer/replayer/Replayer.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@
		#include <gui/Surface.h>
		#include <private/gui/ComposerService.h>

		#include <ui/DisplayInfo.h>
		#include <utils/Log.h>
		#include <utils/String8.h>
		#include <utils/Trace.h>