Merge "Reject usage == 0 in AHardwareBuffer_lock* functions" into main (c4517912) · Commits · e / os / android_frameworks_native

libs/nativewindow/AHardwareBuffer.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -196,8 +196,8 @@ int AHardwareBuffer_lockAndGetInfo(AHardwareBuffer* buffer, uint64_t usage,
		return BAD_VALUE;
		}

		if (usage & ~(AHARDWAREBUFFER_USAGE_CPU_READ_MASK \|
		AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK)) {
		if (usage & ~(AHARDWAREBUFFER_USAGE_CPU_READ_MASK \| AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK) \|\|
		usage == 0) {
		ALOGE("Invalid usage flags passed to AHardwareBuffer_lock; only "
		"AHARDWAREBUFFER_USAGE_CPU_* flags are allowed");
		return BAD_VALUE;
		@@ -248,8 +248,8 @@ int AHardwareBuffer_lock(AHardwareBuffer* buffer, uint64_t usage,

		if (!buffer) return BAD_VALUE;

		if (usage & ~(AHARDWAREBUFFER_USAGE_CPU_READ_MASK \|
		AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK)) {
		if (usage & ~(AHARDWAREBUFFER_USAGE_CPU_READ_MASK \| AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK) \|\|
		usage == 0) {
		ALOGE("Invalid usage flags passed to AHardwareBuffer_lock; only "
		"AHARDWAREBUFFER_USAGE_CPU_* flags are allowed");
		return BAD_VALUE;
		@@ -277,8 +277,8 @@ int AHardwareBuffer_lockPlanes(AHardwareBuffer* buffer, uint64_t usage,
		int32_t fence, const ARect* rect, AHardwareBuffer_Planes* outPlanes) {
		if (!buffer \|\| !outPlanes) return BAD_VALUE;

		if (usage & ~(AHARDWAREBUFFER_USAGE_CPU_READ_MASK \|
		AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK)) {
		if (usage & ~(AHARDWAREBUFFER_USAGE_CPU_READ_MASK \| AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK) \|\|
		usage == 0) {
		ALOGE("Invalid usage flags passed to AHardwareBuffer_lock; only "
		" AHARDWAREBUFFER_USAGE_CPU_* flags are allowed");
		return BAD_VALUE;