Merge "Add WeaverReadStatus to WeaverReadResponse" (aea995af) · Commits · e / os / android_hardware_interfaces

weaver/aidl/Android.bp

+6 −1

Original line number	Diff line number	Diff line
		@@ -17,5 +17,10 @@ aidl_interface {
		platform_apis: true,
		},
		},
		versions: ["1"],
		versions_with_info: [
		{
		version: "1",
		imports: [],
		},
		],
		}

weaver/aidl/aidl_api/android.hardware.weaver/current/android/hardware/weaver/WeaverReadResponse.aidl

+2 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright 2020 The Android Open Source Project
		* Copyright 2022 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.
		@@ -36,4 +36,5 @@ package android.hardware.weaver;
		parcelable WeaverReadResponse {
		long timeout;
		byte[] value;
		android.hardware.weaver.WeaverReadStatus status = android.hardware.weaver.WeaverReadStatus.FAILED;
		}

weaver/aidl/aidl_api/android.hardware.weaver/current/android/hardware/weaver/WeaverReadStatus.aidl

0 → 100644

+41 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.
		*/
		///////////////////////////////////////////////////////////////////////////////
		// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
		///////////////////////////////////////////////////////////////////////////////

		// This file is a snapshot of an AIDL file. Do not edit it manually. There are
		// two cases:
		// 1). this is a frozen version file - do not edit this in any case.
		// 2). this is a 'current' file. If you make a backwards compatible change to
		// the interface (from the latest frozen version), the build system will
		// prompt you to update this file with `m <name>-update-api`.
		//
		// You must not make a backward incompatible change to any AIDL file built
		// with the aidl_interface module type with versions property set. The module
		// type is used to build AIDL files in a way that they can be used across
		// independently updatable components of the system. If a device is shipped
		// with such a backward incompatible change, it has a high risk of breaking
		// later when a module using the interface is updated, e.g., Mainline modules.

		package android.hardware.weaver;
		@Backing(type="int") @VintfStability
		enum WeaverReadStatus {
		OK = 0,
		FAILED = 1,
		INCORRECT_KEY = 2,
		THROTTLE = 3,
		}

weaver/aidl/android/hardware/weaver/WeaverReadResponse.aidl

+9 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright 2020 The Android Open Source Project
		* Copyright 2022 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.
		@@ -16,15 +16,22 @@

		package android.hardware.weaver;

		import android.hardware.weaver.WeaverReadStatus;

		@VintfStability
		parcelable WeaverReadResponse {
		/**
		* The time to wait, in milliseconds, before making the next request.
		* The time to wait, in milliseconds, before making the next request,
		* must be greater than or equal to zero and less than INT_MAX.
		*/
		long timeout;
		/**
		* The value read from the slot or empty if the value was not read.
		*/
		byte[] value;
		/**
		* Status from WeaverReadStatus
		*/
		WeaverReadStatus status = WeaverReadStatus.FAILED;
		}

weaver/aidl/android/hardware/weaver/WeaverReadStatus.aidl

0 → 100644

+26 −0

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

		@VintfStability
		@Backing(type="int")
		enum WeaverReadStatus {
		OK,
		FAILED,
		INCORRECT_KEY,
		THROTTLE,
		}