Elliott Hughes
ddf87aadb3
Merge "Switch adb over to <chrono>." am: 59826ddee5 am: 2278b50f24
...
am: bd51a0d30d
2016-11-16 20:29:22 +00:00
Elliott Hughes
bd51a0d30d
Merge "Switch adb over to <chrono>." am: 59826ddee5
...
am: 2278b50f24
2016-11-16 20:21:51 +00:00
Elliott Hughes
2278b50f24
Merge "Switch adb over to <chrono>."
...
am: 59826ddee5
2016-11-16 20:14:20 +00:00
Treehugger Robot
59826ddee5
Merge "Switch adb over to <chrono>."
2016-11-16 20:05:52 +00:00
Elliott Hughes
dbe91eee26
Switch adb over to <chrono>.
...
Clearer code, and lets us lose some more portability cruft.
Bug: http://b/32878766
Test: manual
Change-Id: Ie44928bbf8d68a74127aaf76e7e0060e25fa2cc8
2016-11-16 09:12:12 -08:00
Daichi Hirono
2b73980091
Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT." am: 0673412bb9 am: 357876455c
...
am: 5f7ed2dd60
2016-11-16 08:10:26 +00:00
Daichi Hirono
5f7ed2dd60
Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT." am: 0673412bb9
...
am: 357876455c
2016-11-16 08:02:24 +00:00
Daichi Hirono
357876455c
Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT."
...
am: 0673412bb9
2016-11-16 07:54:10 +00:00
Treehugger Robot
0673412bb9
Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT."
2016-11-16 07:46:44 +00:00
Tao Bao
d76eb17eef
Merge "Update to new minui text API" am: 335502453d -s ours am: b6a8454cd5
...
am: 11c19d9b15
2016-11-16 07:16:17 +00:00
Tao Bao
11c19d9b15
Merge "Update to new minui text API" am: 335502453d -s ours
...
am: b6a8454cd5
2016-11-16 07:08:45 +00:00
Tao Bao
b6a8454cd5
Merge "Update to new minui text API"
...
am: 335502453d
2016-11-16 07:00:47 +00:00
Tao Bao
335502453d
Merge "Update to new minui text API"
2016-11-16 05:52:18 +00:00
Daichi Hirono
b70965cfce
Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always if available." am: c884f80755 am: c0a79ff4cf
...
am: 401f8b6935
2016-11-16 04:24:55 +00:00
Daichi Hirono
401f8b6935
Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always if available." am: c884f80755
...
am: c0a79ff4cf
2016-11-16 04:17:55 +00:00
Daichi Hirono
c0a79ff4cf
Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always if available."
...
am: c884f80755
2016-11-16 04:09:53 +00:00
Treehugger Robot
c884f80755
Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always if available."
2016-11-16 03:57:46 +00:00
Ting-Yuan Huang
ec111ad6c1
Merge "init: fix memory leaks" am: a73ba879b1 am: 1700a162d5
...
am: fde3b5b95a
2016-11-16 03:47:12 +00:00
Ting-Yuan Huang
fde3b5b95a
Merge "init: fix memory leaks" am: a73ba879b1
...
am: 1700a162d5
2016-11-16 03:39:37 +00:00
Ting-Yuan Huang
1700a162d5
Merge "init: fix memory leaks"
...
am: a73ba879b1
2016-11-16 03:32:40 +00:00
Ting-Yuan Huang
cc187be646
Merge "toolbox: fix memory leak" am: e3bd4a2fec am: 32bf66a168
...
am: 7fef2a4b20
2016-11-16 03:32:21 +00:00
Treehugger Robot
a73ba879b1
Merge "init: fix memory leaks"
2016-11-16 03:25:34 +00:00
Ting-Yuan Huang
7fef2a4b20
Merge "toolbox: fix memory leak" am: e3bd4a2fec
...
am: 32bf66a168
2016-11-16 03:25:21 +00:00
Ting-Yuan Huang
32bf66a168
Merge "toolbox: fix memory leak"
...
am: e3bd4a2fec
2016-11-16 03:17:20 +00:00
Treehugger Robot
e3bd4a2fec
Merge "toolbox: fix memory leak"
2016-11-16 03:10:38 +00:00
Daichi Hirono
16d0b426a3
Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT.
...
We return the minor version number 15 to FUSE_INIT since we don't handle
BATCH_FORGET. Thus the kernel does not accept the latest size of
fuse_init_out. Instead we need to use FUSE_COMPAT_22_INIT_OUT_SIZE.
Previously the code unintentionally used FUSE_COMPAT_22_INIT_OUT_SIZE always
because we override the minor version out->minor to 15. Because sdcard.c shares
the buffer for |in| and |out|, it overrides the version number of in->minnor as
well.
The if closure in the previous code "if (in->minor <= 22)" was always true. The
CL removes the if closure to explicitly use FUSE_COMPAT_22_INIT_OUT_SIZE always.
Bug: 32779923
Test: Manually boot Android and check if the storage shows up in Settings app.
Change-Id: Ibbc50da7fb82be148acfc5f1a3d46fefbe211f9d
2016-11-16 01:58:28 +00:00
Daichi Hirono
471ad6a59d
Use FUSE_COMPAT_22_INIT_OUT_SIZE always if available.
...
We return the minor version number 15 to FUSE_INIT since we don't handle
BATCH_FORGET. Thus the kernel does not accept the latest size of
fuse_init_out. Instead we need to use FUSE_COMPAT_22_INIT_OUT_SIZE.
Bug: 32779923
Test: libappfuse_test
Change-Id: I5c979d0e45344ca8adfe3ad3f4a9561442abcb3a
2016-11-16 01:56:00 +00:00
Ting-Yuan Huang
09bd41d097
init: fix memory leaks
...
It's possible that node is not freed before return.
Test: make WITH_TIDY=1 mmma system/core/init
Change-Id: I648eea9dda006d2b2239e169785190817ad31352
2016-11-15 16:55:50 -08:00
Mark Salyzyn
dbb947de82
Merge "liblog: logprint: report truncated event log contents if error" am: 9258348219 am: 4a9419f627
...
am: f8768b6402
2016-11-16 00:40:28 +00:00
Mark Salyzyn
f8768b6402
Merge "liblog: logprint: report truncated event log contents if error" am: 9258348219
...
am: 4a9419f627
2016-11-16 00:32:59 +00:00
Ting-Yuan Huang
58da81d987
toolbox: fix memory leak
...
free img
Test: make WITH_TIDY=1 mmma system/core/toolbox
Change-Id: I2f8feff0eddca763ee4e7fc9867480af60c8a911
2016-11-15 16:27:03 -08:00
Mark Salyzyn
4a9419f627
Merge "liblog: logprint: report truncated event log contents if error"
...
am: 9258348219
2016-11-16 00:26:00 +00:00
Mark Salyzyn
9258348219
Merge "liblog: logprint: report truncated event log contents if error"
2016-11-16 00:18:02 +00:00
Mark Salyzyn
1a57ae3a7d
liblog: logprint: report truncated event log contents if error
...
We need to accept that a log tag can contain no payload. For those
that are corrupted, and to aid debugging, report what we did manage
to interpret. Report last character as a ! for corruption, and ^
for truncation. Fix a few Android Coding standard issues.
Test: gTest logcat-unit-tests
Bug: 32903864
Change-Id: Id11bef3a7b6569305c51701dd66c45d2038d6628
2016-11-15 14:46:34 -08:00
Tao Bao
87cbd3aaf9
Merge "ziparchive: Allow ExtractEntryToFile() to work with block device." am: 787482ecd9 am: af2a8858c4
...
am: 9b1b0627b9
2016-11-15 22:26:48 +00:00
Damien Bargiacchi
329c60458b
Update to new minui text API
...
Change-Id: Ic753564a397b90a9ba54660c78bec9c1a1ef583d
(cherry picked from commit 0ee524de68
2016-11-15 14:25:44 -08:00
Tao Bao
9b1b0627b9
Merge "ziparchive: Allow ExtractEntryToFile() to work with block device." am: 787482ecd9
...
am: af2a8858c4
2016-11-15 22:18:49 +00:00
Tao Bao
af2a8858c4
Merge "ziparchive: Allow ExtractEntryToFile() to work with block device."
...
am: 787482ecd9
2016-11-15 22:11:21 +00:00
Tao Bao
787482ecd9
Merge "ziparchive: Allow ExtractEntryToFile() to work with block device."
2016-11-15 22:00:47 +00:00
Elliott Hughes
06d14cd839
Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for." am: f3e731b3c5 am: 3ee9807554
...
am: 74c997ffda
2016-11-15 18:25:18 +00:00
Tao Bao
a456c21348
ziparchive: Allow ExtractEntryToFile() to work with block device.
...
FileWriter::Create() calls ftruncate(2) to truncate the destination
file, which doesn't work with FD that references a block device. It
leads to kIoError when calling ExtractEntryToFile() to extract an entry
to block device FD.
As a result, it fails the package_extract_file() command in OTA updates
(e.g. 'package_extract_file("boot.img",
"/dev/block/platform/soc.0/f9824900.sdhci/by-name/boot")').
This CL skips the call to ftruncate(2) if FD references a block device.
Bug: 32903624
Test: ziparchive-tests works.
Test: Build an OTA updater (m updater) and call package_extract_file().
Change-Id: Ia81116f1a8d7cab802396bdc32c6096b4cb56a3c
2016-11-15 10:19:04 -08:00
Elliott Hughes
74c997ffda
Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for." am: f3e731b3c5
...
am: 3ee9807554
2016-11-15 18:17:16 +00:00
Elliott Hughes
3ee9807554
Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for."
...
am: f3e731b3c5
2016-11-15 18:09:46 +00:00
Elliott Hughes
f3e731b3c5
Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for."
2016-11-15 18:02:30 +00:00
Wei Wang
db738953f4
Merge "init: fix BuildTriggersString for empty string" am: 9b1d5e15ef am: 4286801ccb
...
am: 8256062afc
2016-11-15 17:47:15 +00:00
Wei Wang
8256062afc
Merge "init: fix BuildTriggersString for empty string" am: 9b1d5e15ef
...
am: 4286801ccb
2016-11-15 17:39:45 +00:00
Wei Wang
4286801ccb
Merge "init: fix BuildTriggersString for empty string"
...
am: 9b1d5e15ef
2016-11-15 17:32:13 +00:00
Treehugger Robot
9b1d5e15ef
Merge "init: fix BuildTriggersString for empty string"
2016-11-15 17:23:56 +00:00
Nick Desaulniers
d7a92fd874
Merge "Revert "init: warn slow action"" am: 431c489568 am: ea516950fb
...
am: 6133e64575
2016-11-15 07:20:42 +00:00
Nick Desaulniers
6133e64575
Merge "Revert "init: warn slow action"" am: 431c489568
...
am: ea516950fb
2016-11-15 07:12:41 +00:00
