Snap for 4500033 from bb01ca70ea9bac7d120666f6673b296bf65b6560 to pi-release (f73f857e) · Commits · e / os / android_frameworks_native

libs/binder/tests/binderDriverInterfaceTest.cpp

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -77,6 +77,16 @@ class BinderDriverInterfaceTest : public ::testing::Test {
	virtual void TearDown() {		virtual void TearDown() {
	}		}
	protected:		protected:
			/* The ioctl must either return 0, or if it doesn't errno should be accepted_errno */
			void binderTestIoctlSuccessOrError(int cmd, void *arg, int accepted_errno) {
			int ret;

			ret = ioctl(m_binderFd, cmd, arg);
			if (ret != 0) {
			EXPECT_EQ(errno, accepted_errno);
			}
			}

	void binderTestIoctlRetErr2(int cmd, void *arg, int expect_ret, int expect_errno, int accept_errno) {		void binderTestIoctlRetErr2(int cmd, void *arg, int expect_ret, int expect_errno, int accept_errno) {
	int ret;		int ret;

	@@ -256,7 +266,7 @@ TEST_F(BinderDriverInterfaceTest, Transaction) {

	{		{
	SCOPED_TRACE("1st WriteRead");		SCOPED_TRACE("1st WriteRead");
	binderTestIoctl(BINDER_WRITE_READ, &bwr);		binderTestIoctlSuccessOrError(BINDER_WRITE_READ, &bwr, EAGAIN);
	}		}
	EXPECT_EQ(sizeof(bc1), bwr.write_consumed);		EXPECT_EQ(sizeof(bc1), bwr.write_consumed);
	if (bwr.read_consumed < offsetof(typeof(br), pad)) {		if (bwr.read_consumed < offsetof(typeof(br), pad)) {

+4 −1

+0 −0

File moved.

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -86,15 +86,18 @@ public:
	}		}

	// rectangle's width		// rectangle's width
			__attribute__((no_sanitize("signed-integer-overflow")))
	inline int32_t getWidth() const {		inline int32_t getWidth() const {
	return right - left;		return right - left;
	}		}

	// rectangle's height		// rectangle's height
			__attribute__((no_sanitize("signed-integer-overflow")))
	inline int32_t getHeight() const {		inline int32_t getHeight() const {
	return bottom - top;		return bottom - top;
	}		}

			__attribute__((no_sanitize("signed-integer-overflow")))
	inline Rect getBounds() const {		inline Rect getBounds() const {
	return Rect(right - left, bottom - top);		return Rect(right - left, bottom - top);
	}		}