Snap for 8012902 from 0a5a431d3186f84270bdc06795ce38afc05f2c57 to tm-release (bac8c1d0) · Commits · e / os / android_hardware_interfaces

bluetooth/audio/2.1/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ hidl_interface {
		],
		apex_available: [
		"//apex_available:platform",
		"com.android.bluetooth.updatable",
		"com.android.bluetooth",
		],
		gen_java: false,
		}

bluetooth/audio/2.2/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ hidl_interface {
		],
		apex_available: [
		"//apex_available:platform",
		"com.android.bluetooth.updatable",
		"com.android.bluetooth",
		],
		gen_java: false,
		}

compatibility_matrices/compatibility_matrix.current.xml

+15 −0

Original line number	Diff line number	Diff line
		@@ -370,6 +370,14 @@
		<instance>strongbox</instance>
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>android.hardware.security.dice</name>
		<version>1</version>
		<interface>
		<name>IDiceDevice</name>
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>android.hardware.security.keymint</name>
		<version>1-2</version>
		@@ -787,4 +795,11 @@
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>android.hardware.wifi.supplicant</name>
		<interface>
		<name>ISupplicant</name>
		<instance>default</instance>
		</interface>
		</hal>
		</compatibility-matrix>

graphics/composer/2.1/utils/vts/GraphicsComposerCallback.cpp

+12 −5

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ void GraphicsComposerCallback::setVsyncAllowed(bool allowed) {

		std::vector<Display> GraphicsComposerCallback::getDisplays() const {
		std::lock_guard<std::mutex> lock(mMutex);
		return std::vector<Display>(mDisplays.begin(), mDisplays.end());
		return mDisplays;
		}

		int GraphicsComposerCallback::getInvalidHotplugCount() const {
		@@ -51,12 +51,17 @@ int GraphicsComposerCallback::getInvalidVsyncCount() const {
		Return<void> GraphicsComposerCallback::onHotplug(Display display, Connection connection) {
		std::lock_guard<std::mutex> lock(mMutex);

		auto it = std::find(mDisplays.begin(), mDisplays.end(), display);
		if (connection == Connection::CONNECTED) {
		if (!mDisplays.insert(display).second) {
		if (it == mDisplays.end()) {
		mDisplays.push_back(display);
		} else {
		mInvalidHotplugCount++;
		}
		} else if (connection == Connection::DISCONNECTED) {
		if (!mDisplays.erase(display)) {
		if (it != mDisplays.end()) {
		mDisplays.erase(it);
		} else {
		mInvalidHotplugCount++;
		}
		}
		@@ -67,7 +72,8 @@ Return<void> GraphicsComposerCallback::onHotplug(Display display, Connection con
		Return<void> GraphicsComposerCallback::onRefresh(Display display) {
		std::lock_guard<std::mutex> lock(mMutex);

		if (mDisplays.count(display) == 0) {
		auto it = std::find(mDisplays.begin(), mDisplays.end(), display);
		if (it == mDisplays.end()) {
		mInvalidRefreshCount++;
		}

		@@ -77,7 +83,8 @@ Return<void> GraphicsComposerCallback::onRefresh(Display display) {
		Return<void> GraphicsComposerCallback::onVsync(Display display, int64_t) {
		std::lock_guard<std::mutex> lock(mMutex);

		if (!mVsyncAllowed \|\| mDisplays.count(display) == 0) {
		auto it = std::find(mDisplays.begin(), mDisplays.end(), display);
		if (!mVsyncAllowed \|\| it == mDisplays.end()) {
		mInvalidVsyncCount++;
		}

graphics/composer/2.1/utils/vts/include/composer-vts/2.1/GraphicsComposerCallback.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		#include <android/hardware/graphics/composer/2.1/IComposerCallback.h>

		#include <mutex>
		#include <unordered_set>
		#include <vector>

		namespace android {
		namespace hardware {
		@@ -48,7 +48,7 @@ class GraphicsComposerCallback : public IComposerCallback {

		mutable std::mutex mMutex;
		// the set of all currently connected displays
		std::unordered_set<Display> mDisplays;
		std::vector<Display> mDisplays;
		// true only when vsync is enabled
		bool mVsyncAllowed = true;