ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes I891f64fb,I6182d84e

Browse source 
am: 1fd4b364fc

Change-Id: I2db90f207c6ad337dc40cc7df1cecaf5a38760c3
This commit is contained in:
Greg Kaiser 2018-09-06 10:19:15 -07:00 • committed by android-build-merger
commit d9b6122424
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fastboot/fuzzy_fastboot/usb_transport_sniffer.h
View file

@ -72,7 +72,7 @@ class UsbTransportSniffer : public UsbTransport {
virtual ssize_t Read(void* data, size_t len) override;
virtual ssize_t Write(const void* data, size_t len) override;
virtual int Close() override;
virtual int Close() override final; // note usage in destructor
virtual int Reset() override;
const std::vector<Event> Transfers();

2
logcat/tests/logcat_test.cpp
View file

@ -1230,7 +1230,7 @@ TEST(logcat, blocking_clear) {
}
int size, consumed, max, payload;
char size_mult[3], consumed_mult[3];
char size_mult[4], consumed_mult[4];
size = consumed = max = payload = 0;
if (6 == sscanf(buffer,
"events: ring buffer is %d %3s (%d %3s consumed),"