Merge "adb: partially revert b5e11415." am: ef9426d883 am: d3f7956f2f (294a3e42) · Commits · e / os / android_system_core

adb/test_device.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -1237,7 +1237,7 @@ class DeviceOfflineTest(DeviceTest):
		return m.group(2)
		return None

		def test_killed_when_pushing_a_large_file(self):
		def disabled_test_killed_when_pushing_a_large_file(self):
		"""
		While running adb push with a large file, kill adb server.
		Occasionally the device becomes offline. Because the device is still
		@@ -1268,7 +1268,7 @@ class DeviceOfflineTest(DeviceTest):
		# 4. The device should be online
		self.assertEqual(self._get_device_state(serialno), 'device')

		def test_killed_when_pulling_a_large_file(self):
		def disabled_test_killed_when_pulling_a_large_file(self):
		"""
		While running adb pull with a large file, kill adb server.
		Occasionally the device can't be connected. Because the device is trying to

+0 −8

Original line number	Diff line number	Diff line
		@@ -748,9 +748,6 @@ atransport* acquire_one_transport(TransportType type, const char* serial, Transp
		}

		int atransport::Write(apacket* p) {
		#if ADB_HOST
		std::lock_guard<std::mutex> lock(write_msg_lock_);
		#endif
		return write_func_(p, this);
		}

		@@ -758,11 +755,6 @@ void atransport::Kick() {
		if (!kicked_) {
		kicked_ = true;
		CHECK(kick_func_ != nullptr);
		#if ADB_HOST
		// On host, adb server should avoid writing part of a packet, so don't
		// kick a transport whiling writing a packet.
		std::lock_guard<std::mutex> lock(write_msg_lock_);
		#endif
		kick_func_(this);
		}
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -181,7 +181,6 @@ private:
		std::atomic<ConnectionState> connection_state_;
		#if ADB_HOST
		std::deque<std::shared_ptr<RSA>> keys_;
		std::mutex write_msg_lock_;
		bool has_send_connect_on_error_ = false;
		#endif