Snap for 4535700 from 893798b19be959b6a138b88aa25fbc98292a58b9 to pi-release (70372af9) · Commits · e / os / android_hardware_interfaces

bluetooth/1.0/default/vendor_interface.cc

+3 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ uint32_t lpm_timeout_ms;
		bool recent_activity_flag;

		VendorInterface* g_vendor_interface = nullptr;
		std::mutex wakeup_mutex_;

		HC_BT_HDR* WrapPacketAndCopy(uint16_t event, const hidl_vec<uint8_t>& data) {
		size_t packet_size = data.size() + sizeof(HC_BT_HDR);
		@@ -308,6 +309,7 @@ void VendorInterface::Close() {
		}

		size_t VendorInterface::Send(uint8_t type, const uint8_t* data, size_t length) {
		std::unique_lock<std::mutex> lock(wakeup_mutex_);
		recent_activity_flag = true;

		if (lpm_wake_deasserted == true) {
		@@ -350,6 +352,7 @@ void VendorInterface::OnFirmwareConfigured(uint8_t result) {

		void VendorInterface::OnTimeout() {
		ALOGV("%s", __func__);
		std::unique_lock<std::mutex> lock(wakeup_mutex_);
		if (recent_activity_flag == false) {
		lpm_wake_deasserted = true;
		bt_vendor_lpm_wake_state_t wakeState = BT_VND_LPM_WAKE_DEASSERT;

broadcastradio/1.2/default/Tuner.cpp

+5 −1

Original line number	Diff line number	Diff line
		@@ -343,7 +343,11 @@ Return<ProgramListResult> Tuner::startBackgroundScan() {
		lock_guard<mutex> lk(mMut);
		if (mIsClosed) return ProgramListResult::NOT_INITIALIZED;

		return ProgramListResult::UNAVAILABLE;
		if (mCallback1_1 != nullptr) {
		mCallback1_1->backgroundScanComplete(ProgramListResult::OK);
		}

		return ProgramListResult::OK;
		}

		Return<void> Tuner::getProgramList(const hidl_vec<VendorKeyValue>& vendorFilter,

camera/metadata/3.3/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,9 @@ hidl_interface {
		],
		types: [
		"CameraMetadataEnumAndroidControlAfSceneChange",
		"CameraMetadataEnumAndroidControlCaptureIntent",
		"CameraMetadataEnumAndroidLensPoseReference",
		"CameraMetadataEnumAndroidRequestAvailableCapabilities",
		"CameraMetadataTag",
		],
		gen_java: true,

camera/metadata/3.3/types.hal

+34 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,16 @@ enum CameraMetadataTag : @3.2::CameraMetadataTag {

		ANDROID_CONTROL_END_3_3,

		/** android.lens.poseReference [static, enum, public]
		*
		* <p>The origin for ANDROID_LENS_POSE_TRANSLATION.</p>
		*
		* @see ANDROID_LENS_POSE_TRANSLATION
		*/
		ANDROID_LENS_POSE_REFERENCE = android.hardware.camera.metadata@3.2::CameraMetadataTag:ANDROID_LENS_END,

		ANDROID_LENS_END_3_3,

		/** android.info.version [static, byte, public]
		*
		* <p>A short string for manufacturer version information about the camera device, such as
		@@ -58,6 +68,14 @@ enum CameraMetadataTag : @3.2::CameraMetadataTag {
		* Enumeration definitions for the various entries that need them
		*/

		/** android.control.captureIntent enumeration values added since v3.2
		* @see ANDROID_CONTROL_CAPTURE_INTENT
		*/
		enum CameraMetadataEnumAndroidControlCaptureIntent :
		@3.2::CameraMetadataEnumAndroidControlCaptureIntent {
		ANDROID_CONTROL_CAPTURE_INTENT_MOTION_TRACKING,
		};

		/** android.control.afSceneChange enumeration values
		* @see ANDROID_CONTROL_AF_SCENE_CHANGE
		*/
		@@ -65,3 +83,19 @@ enum CameraMetadataEnumAndroidControlAfSceneChange : uint32_t {
		ANDROID_CONTROL_AF_SCENE_CHANGE_NOT_DETECTED,
		ANDROID_CONTROL_AF_SCENE_CHANGE_DETECTED,
		};

		/** android.lens.poseReference enumeration values
		* @see ANDROID_LENS_POSE_REFERENCE
		*/
		enum CameraMetadataEnumAndroidLensPoseReference : uint32_t {
		ANDROID_LENS_POSE_REFERENCE_PRIMARY_CAMERA,
		ANDROID_LENS_POSE_REFERENCE_GYROSCOPE,
		};

		/** android.request.availableCapabilities enumeration values added since v3.2
		* @see ANDROID_REQUEST_AVAILABLE_CAPABILITIES
		*/
		enum CameraMetadataEnumAndroidRequestAvailableCapabilities :
		@3.2::CameraMetadataEnumAndroidRequestAvailableCapabilities {
		ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MOTION_TRACKING,
		};

configstore/1.0/default/Android.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -3,7 +3,10 @@ LOCAL_PATH := $(call my-dir)
		################################################################################
		include $(CLEAR_VARS)
		LOCAL_MODULE := android.hardware.configstore@1.0-service
		# seccomp is not required for coverage build.
		ifneq ($(NATIVE_COVERAGE),true)
		LOCAL_REQUIRED_MODULES_arm64 := configstore@1.0.policy
		endif
		LOCAL_PROPRIETARY_MODULE := true
		LOCAL_MODULE_CLASS := EXECUTABLES
		LOCAL_MODULE_RELATIVE_PATH := hw