Snap for 4551672 from 43ca3b0a3783396f635201293aca5bb094ae91ee to pi-release (85d5681b) · Commits · e / os / android_hardware_interfaces

audio/2.0/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ hidl_interface {
		],
		interfaces: [
		"android.hardware.audio.common@2.0",
		"android.hardware.audio.effect@2.0",
		"android.hidl.base@1.0",
		],
		types: [

camera/metadata/3.3/types.hal

+9 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,15 @@ enum CameraMetadataTag : @3.2::CameraMetadataTag {

		ANDROID_LENS_END_3_3,

		/** android.request.availableSessionKeys [static, int32[], ndk_public]
		*
		* <p>A subset of the available request keys that the camera device
		* can pass as part of the capture session initialization.</p>
		*/
		ANDROID_REQUEST_AVAILABLE_SESSION_KEYS = android.hardware.camera.metadata@3.2::CameraMetadataTag:ANDROID_REQUEST_END,

		ANDROID_REQUEST_END_3_3,

		/** android.info.version [static, byte, public]
		*
		* <p>A short string for manufacturer version information about the camera device, such as

compatibility_matrices/compatibility_matrix.current.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -229,7 +229,7 @@
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.power</name>
		<version>1.0-1</version>
		<version>1.0-2</version>
		<interface>
		<name>IPower</name>
		<instance>default</instance>

health/2.0/IHealth.hal

+5 −5

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ interface IHealth {
		* NOT_SUPPORTED if this property is not supported
		* (e.g. the file that stores this property does not exist),
		* UNKNOWN for other errors.
		* @return value battery capacity, or INT32_MIN if not successful.
		* @return value battery capacity, or 0 if not successful.
		*/
		getChargeCounter() generates (Result result, int32_t value);

		@@ -84,7 +84,7 @@ interface IHealth {
		* NOT_SUPPORTED if this property is not supported
		* (e.g. the file that stores this property does not exist),
		* UNKNOWN for other errors.
		* @return value instantaneous battery current, or INT32_MIN if not
		* @return value instantaneous battery current, or 0 if not
		* successful.
		*/
		getCurrentNow() generates (Result result, int32_t value);
		@@ -101,7 +101,7 @@ interface IHealth {
		* NOT_SUPPORTED if this property is not supported
		* (e.g. the file that stores this property does not exist),
		* UNKNOWN for other errors.
		* @return value average battery current, or INT32_MIN if not successful.
		* @return value average battery current, or 0 if not successful.
		*/
		getCurrentAverage() generates (Result result, int32_t value);

		@@ -113,7 +113,7 @@ interface IHealth {
		* NOT_SUPPORTED if this property is not supported
		* (e.g. the file that stores this property does not exist),
		* UNKNOWN for other errors.
		* @return value remaining battery capacity, or INT32_MIN if not successful.
		* @return value remaining battery capacity, or 0 if not successful.
		*/
		getCapacity() generates (Result result, int32_t value);

		@@ -123,7 +123,7 @@ interface IHealth {
		* @return result SUCCESS if successful,
		* NOT_SUPPORTED if this property is not supported,
		* UNKNOWN for other errors.
		* @return value remaining energy, or INT64_MIN if not successful.
		* @return value remaining energy, or 0 if not successful.
		*/
		getEnergyCounter() generates (Result result, int64_t value);

health/2.0/default/Health.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -108,27 +108,27 @@ void getProperty(const std::unique_ptr<BatteryMonitor>& monitor, int id, T defau
		}

		Return<void> Health::getChargeCounter(getChargeCounter_cb _hidl_cb) {
		getProperty(battery_monitor_, BATTERY_PROP_CHARGE_COUNTER, INT32_MIN, _hidl_cb);
		getProperty<int32_t>(battery_monitor_, BATTERY_PROP_CHARGE_COUNTER, 0, _hidl_cb);
		return Void();
		}

		Return<void> Health::getCurrentNow(getCurrentNow_cb _hidl_cb) {
		getProperty(battery_monitor_, BATTERY_PROP_CURRENT_NOW, INT32_MIN, _hidl_cb);
		getProperty<int32_t>(battery_monitor_, BATTERY_PROP_CURRENT_NOW, 0, _hidl_cb);
		return Void();
		}

		Return<void> Health::getCurrentAverage(getCurrentAverage_cb _hidl_cb) {
		getProperty(battery_monitor_, BATTERY_PROP_CURRENT_AVG, INT32_MIN, _hidl_cb);
		getProperty<int32_t>(battery_monitor_, BATTERY_PROP_CURRENT_AVG, 0, _hidl_cb);
		return Void();
		}

		Return<void> Health::getCapacity(getCapacity_cb _hidl_cb) {
		getProperty(battery_monitor_, BATTERY_PROP_CAPACITY, INT32_MIN, _hidl_cb);
		getProperty<int32_t>(battery_monitor_, BATTERY_PROP_CAPACITY, 0, _hidl_cb);
		return Void();
		}

		Return<void> Health::getEnergyCounter(getEnergyCounter_cb _hidl_cb) {
		getProperty(battery_monitor_, BATTERY_PROP_ENERGY_COUNTER, INT64_MIN, _hidl_cb);
		getProperty<int64_t>(battery_monitor_, BATTERY_PROP_ENERGY_COUNTER, 0, _hidl_cb);
		return Void();
		}