Merge "Make IDumpstateDevice 1.1" am: 99ad09b7e7 am: e067d70f96 (e673d599) · Commits · e / os / android_hardware_interfaces

compatibility_matrices/compatibility_matrix.current.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -165,7 +165,7 @@
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.dumpstate</name>
		<version>1.0</version>
		<version>1.1</version>
		<interface>
		<name>IDumpstateDevice</name>
		<instance>default</instance>

current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -618,6 +618,8 @@ dd377f404a8e71f6191d295e10067db629b0f0c28e594af906f2bea5d87fe2cc android.hardwar
		40ab2c6866c18d32baf6e49e3053949e79601f56963a791e93e68b9ee18f718d android.hardware.bluetooth@1.1::IBluetoothHciCallbacks
		07d0a252b2d8fa35887908a996ba395cf392968395fc30afab791f46e0c22a52 android.hardware.boot@1.1::IBootControl
		74049a402be913963edfdd80828a53736570e9d8124a1bf18166b6ed46a6b0ab android.hardware.boot@1.1::types
		881aa8720fb1d69aa9843bfab69d810ab7654a61d2f5ab5e2626cbf240f24eaf android.hardware.dumpstate@1.1::types
		13b33f623521ded51a6c0f7ea5b77e97066d0aa1e38a83c2873f08ad67294f89 android.hardware.dumpstate@1.1::IDumpstateDevice
		ce8dbe76eb9ee94b46ef98f725be992e760a5751073d4f4912484026541371f3 android.hardware.health@2.1::IHealth
		26f04510a0b57aba5167c5c0a7c2f077c2acbb98b81902a072517829fd9fd67f android.hardware.health@2.1::IHealthInfoCallback
		db47f4ceceb1f06c656f39caa70c557b0f8471ef59fd58611bea667ffca20101 android.hardware.health@2.1::types

dumpstate/1.0/vts/functional/VtsHalDumpstateV1_0TargetTest.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ TEST_P(DumpstateHidlTest, TestOk) {
		ASSERT_EQ(1, read(fds[0], &buff, 1)) << "dumped nothing";

		native_handle_close(handle);
		native_handle_delete(handle);
		}

		// Positive test: make sure dumpstateBoard() doesn't crash with two FDs.
		@@ -96,6 +97,7 @@ TEST_P(DumpstateHidlTest, TestHandleWithTwoFds) {
		ASSERT_TRUE(status.isOk()) << "Status should be ok: " << status.description();

		native_handle_close(handle);
		native_handle_delete(handle);
		}

		INSTANTIATE_TEST_SUITE_P(

dumpstate/1.1/Android.bp

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		// This file is autogenerated by hidl-gen -Landroidbp.

		hidl_interface {
		name: "android.hardware.dumpstate@1.1",
		root: "android.hardware",
		vndk: {
		enabled: true,
		},
		srcs: [
		"types.hal",
		"IDumpstateDevice.hal",
		],
		interfaces: [
		"android.hardware.dumpstate@1.0",
		"android.hidl.base@1.0",
		],
		gen_java: true,
		}

dumpstate/1.1/IDumpstateDevice.hal

0 → 100644

+53 −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.hardware.dumpstate@1.1;

		import @1.0::IDumpstateDevice;

		interface IDumpstateDevice extends @1.0::IDumpstateDevice {
		/**
		* Extension of dumpstateBoard which also accepts a mode parameter to limit dumped data.
		*
		* For an example of when this is relevant, consider a bug report being generated with
		* DumpstateMode::CONNECTIVITY - there is no reason to include camera or USB logs in this type
		* of report.
		*
		* The 1.0 version of #dumpstateBoard(handle) should just delegate to this new method and pass
		* DumpstateMode::DEFAULT and a timeout of 30,000ms (30 seconds).
		*
		* @param h A native handle with one or two valid file descriptors. The first FD is for text
		* output, the second (if present) is for binary output.
		* @param mode A mode value to restrict dumped content.
		* @param timeoutMillis An approximate "budget" for how much time this call has been allotted.
		* If execution runs longer than this, the IDumpstateDevice service may be killed and only
		* partial information will be included in the report.
		*/
		dumpstateBoard_1_1(handle h, DumpstateMode mode, uint64_t timeoutMillis);

		/**
		* Turns device vendor logging on or off.
		*
		* The setting should be persistent across reboots. Underlying implementations may need to start
		* vendor logging daemons, set system properties, or change logging masks, for example. Given
		* that many vendor logs contain significant amounts of private information and may come with
		* memory/storage/battery impacts, calling this method on a user build should only be done after
		* user consent has been obtained, e.g. from a toggle in developer settings.
		*
		* @param enable Whether to enable or disable device vendor logging.
		* @return success Whether or not the change took effect.
		*/
		setDeviceLoggingEnabled(bool enable) generates (bool success);
		};