Snap for 9682161 from 56ebd52b823f430a8c0fdf8717b8d31d8af6028b to udc-release (e10298a4) · Commits · e / os / platform_frameworks_native

cmds/atrace/atrace.rc

+0 −6

Original line number	Diff line number	Diff line
		@@ -317,12 +317,6 @@ on late-init && property:ro.boot.fastboot.boottrace=enabled
		write /sys/kernel/debug/tracing/tracing_on 1
		write /sys/kernel/tracing/tracing_on 1

		on late-init && property:ro.boot.fastboot.boottrace=enabled
		setprop debug.atrace.tags.enableflags 802922
		setprop persist.traced.enable 0
		write /sys/kernel/debug/tracing/tracing_on 1
		write /sys/kernel/tracing/tracing_on 1

		# Only create the tracing instance if persist.mm_events.enabled
		# Attempting to remove the tracing instance after it has been created
		# will likely fail with EBUSY as it would be in use by traced_probes.

+1 −1

Original line number	Diff line number	Diff line
		@@ -235,7 +235,7 @@ private:
		KeyedVector<int32_t, Key*> mKeys;
		KeyboardType mType;
		std::string mLoadFileName;
		bool mLayoutOverlayApplied;
		bool mLayoutOverlayApplied = false;

		std::map<int32_t /* fromAndroidKeyCode /, int32_t / toAndroidKeyCode */> mKeyRemapping;
		std::map<int32_t /* fromScanCode /, int32_t / toAndroidKeyCode */> mKeysByScanCode;

+6 −6

Original line number	Diff line number	Diff line
		@@ -557,13 +557,12 @@ status_t RpcState::transactAddress(const sp<RpcSession::RpcConnection>& connecti
		.parcelDataSize = static_cast<uint32_t>(data.dataSize()),
		};

		constexpr size_t kWaitMaxUs = 1000000;
		constexpr size_t kWaitLogUs = 10000;
		size_t waitUs = 0;

		// Oneway calls have no sync point, so if many are sent before, whether this
		// is a twoway or oneway transaction, they may have filled up the socket.
		// So, make sure we drain them before polling
		constexpr size_t kWaitMaxUs = 1000000;
		constexpr size_t kWaitLogUs = 10000;
		size_t waitUs = 0;

		iovec iovs[]{
		{&command, sizeof(RpcWireHeader)},
		@@ -591,8 +590,9 @@ status_t RpcState::transactAddress(const sp<RpcSession::RpcConnection>& connecti
		},
		rpcFields->mFds.get());
		status != OK) {
		// TODO(b/167966510): need to undo onBinderLeaving - we know the
		// refcount isn't successfully transferred.
		// rpcSend calls shutdownAndWait, so all refcounts should be reset. If we ever tolerate
		// errors here, then we may need to undo the binder-sent counts for the transaction as
		// well as for the binder objects in the Parcel
		return status;
		}

+7 −1

Original line number	Diff line number	Diff line
		@@ -507,7 +507,13 @@ TEST_F(BinderLibTest, Freeze) {
		}

		EXPECT_EQ(-EAGAIN, IPCThreadState::self()->freeze(pid, true, 0));
		EXPECT_EQ(-EAGAIN, IPCThreadState::self()->freeze(pid, true, 0));

		// b/268232063 - succeeds ~0.08% of the time
		{
		auto ret = IPCThreadState::self()->freeze(pid, true, 0);
		EXPECT_TRUE(ret == -EAGAIN \|\| ret == OK);
		}

		EXPECT_EQ(NO_ERROR, IPCThreadState::self()->freeze(pid, true, 1000));
		EXPECT_EQ(FAILED_TRANSACTION, m_server->transact(BINDER_LIB_TEST_NOP_TRANSACTION, data, &reply));

+0 −6