Mark Salyzyn
cb7f4fd50e
am 76ed92c3: Merge "logd: better drop message merging"
...
* commit '76ed92c3c6882af801f8454a1dd9bf8e3a908ba2':
logd: better drop message merging
2015-04-20 21:20:40 +00:00
Mark Salyzyn
76ed92c3c6
Merge "logd: better drop message merging"
2015-04-20 21:09:10 +00:00
Colin Cross
1c3a69151b
am 10766eac: am 6de70784: am 631cf146: Merge "Fix windows adb build"
...
* commit '10766eac61120732f11b82b1695207a3a5870a47':
Fix windows adb build
2015-04-20 20:53:10 +00:00
Colin Cross
10766eac61
am 6de70784: am 631cf146: Merge "Fix windows adb build"
...
* commit '6de70784ef5bdc6bf495fa86eda68deb16ef2f9e':
Fix windows adb build
2015-04-20 20:31:27 +00:00
Colin Cross
6de70784ef
am 631cf146: Merge "Fix windows adb build"
...
* commit '631cf146274e4f0ef425fd491d39c969a20628a1':
Fix windows adb build
2015-04-20 20:18:56 +00:00
Colin Cross
631cf14627
Merge "Fix windows adb build"
2015-04-20 20:09:51 +00:00
Mark Salyzyn
2c9d909a00
logd: better drop message merging
...
- Former algorithm anlo coalesced adjacent records
- New algorithm maintains a hash list of all drop
records and coalesces them all.
Bug: 20334069
Bug: 20370119
Change-Id: Idc15ce31fc1087c2cfa39da60c62feade8b88761
2015-04-20 12:58:54 -07:00
Colin Cross
dc1e482b20
Fix windows adb build
...
libc++ is not available on windows yet, but it already defaults to
static libstdc++.
Change-Id: I85a766ead84f71fe1f2f59be6ac739b0b833b6db
2015-04-20 12:43:02 -07:00
Colin Cross
454f35fd75
am 48131449: am 858cd9db: am b2b06de5: Merge "statically link adb and fastboot against libc++"
...
* commit '48131449d6258e369e5afeb6c665cc6a343ca297':
statically link adb and fastboot against libc++
2015-04-20 18:56:32 +00:00
Colin Cross
48131449d6
am 858cd9db: am b2b06de5: Merge "statically link adb and fastboot against libc++"
...
* commit '858cd9db3f8712495c03282fb81c5e5d6924285b':
statically link adb and fastboot against libc++
2015-04-20 18:34:13 +00:00
Colin Cross
858cd9db3f
am b2b06de5: Merge "statically link adb and fastboot against libc++"
...
* commit 'b2b06de5fc9605919a06d7757c8ef4a7a48f3e87':
statically link adb and fastboot against libc++
2015-04-20 18:17:11 +00:00
Colin Cross
b2b06de5fc
Merge "statically link adb and fastboot against libc++"
2015-04-20 18:05:29 +00:00
Richard Uhler
587fb6a091
Fix typos in comments
...
Change-Id: Ia06ae6bec66e140fb302c650f7d62304864ca840
2015-04-20 10:10:33 -07:00
Nick Kralevich
cbe9d05020
am b76bcaab: am 20f21e88: am 63fba52c: Merge "create /data/misc/gatekeeper"
...
* commit 'b76bcaaba82511ec720cea9fa2062a81b6901542':
create /data/misc/gatekeeper
2015-04-20 16:43:26 +00:00
Nick Kralevich
b76bcaaba8
am 20f21e88: am 63fba52c: Merge "create /data/misc/gatekeeper"
...
* commit '20f21e88d1643d063b17460699b8f5f38ddbeae8':
create /data/misc/gatekeeper
2015-04-20 16:21:36 +00:00
Nick Kralevich
20f21e88d1
am 63fba52c: Merge "create /data/misc/gatekeeper"
...
* commit '63fba52c2cc90c237df85bc76c364a1deec0b081':
create /data/misc/gatekeeper
2015-04-20 16:10:39 +00:00
Nick Kralevich
63fba52c2c
Merge "create /data/misc/gatekeeper"
2015-04-20 16:01:07 +00:00
Mark Salyzyn
5c39e0ada8
rootfs: init.rc start logd parse error
...
init: /init.rc: 490: invalid option 'start'
Change-Id: Ica985e45d4652dab0ebd434803344f14cc73d834
2015-04-20 15:56:14 +00:00
Nick Kralevich
1450586ffd
create /data/misc/gatekeeper
...
Change-Id: I7631401ac21b60a22f6fd4052814186bf3bc2b05
2015-04-20 08:55:12 -07:00
Elliott Hughes
7b506090e1
Always explain why bind(2) failed.
...
This has confused several people lately.
Bug: http://b/20219978
Change-Id: I2537ceb83bff0b3166c230c728d4389a983db858
2015-04-20 08:09:20 -07:00
Michael Wright
65e93c3b6f
Mark time conversion functions as constexpr
...
Change-Id: I753c6975a8e1d78978c31175b2e1868eb374c442
2015-04-20 15:06:01 +01:00
Narayan Kamath
11413cd251
am 9916e0b4: am 46745cb2: am 4d0cb5e8: Merge "Reserve space on disk using fallocate"
...
* commit '9916e0b43dbdafb5a5a555c21972edd155398421':
Reserve space on disk using fallocate
2015-04-20 10:30:35 +00:00
Narayan Kamath
9916e0b43d
am 46745cb2: am 4d0cb5e8: Merge "Reserve space on disk using fallocate"
...
* commit '46745cb244e864e9d4453d912f2e8a8ae7926a42':
Reserve space on disk using fallocate
2015-04-20 10:09:43 +00:00
Narayan Kamath
46745cb244
am 4d0cb5e8: Merge "Reserve space on disk using fallocate"
...
* commit '4d0cb5e8064cecb25cd7bce7e9932f95a9bef7f4':
Reserve space on disk using fallocate
2015-04-20 09:58:32 +00:00
Narayan Kamath
4d0cb5e806
Merge "Reserve space on disk using fallocate"
2015-04-20 09:49:36 +00:00
Łukasz Szymczyk
e1d5a6aa5c
Reserve space on disk using fallocate
...
There were crashes when android failed to extract
zip archives due to out of free space on disk, with stacks like:
#00 pc 00000000000156b0 /system/lib64/libc.so (memcpy+176)
#01 pc 000000000002e5b8 /system/lib64/libandroidfw.so
#02 pc 000000000002f488 /system/lib64/libandroidfw.so (ExtractToMemory+328)
#03 pc 000000000002f5c8 /system/lib64/libandroidfw.so (ExtractEntryToFile+268)
#04 pc 00000000000287d8 /system/lib64/libandroidfw.so (android::ZipFileRO::\
uncompressEntry(void*, int) const+12)
Space for the file is now allocated using fallocate rather than
ftruncate, since ftruncate dont actually reserve space on disk. When writes
to the mmaped pointer fails to be realized due to out of space SIGBUS
is the result. With this change we make sure that there is space available
before mmaping the pointer.
Change-Id: Ic5e8c33dbe729edb57919dacff73811b34cc2dc2
2015-04-20 09:49:26 +00:00
Elliott Hughes
17649e0f1d
am 59d3779d: am 924869d4: am 34c91edd: Merge "Fix the Windows adb build."
...
* commit '59d3779d2ba96f8806e667461d8aece0b858c6cc':
Fix the Windows adb build.
2015-04-20 02:34:30 +00:00
Elliott Hughes
59d3779d2b
am 924869d4: am 34c91edd: Merge "Fix the Windows adb build."
...
* commit '924869d4eeb0926b991d1369f59b81419d251d52':
Fix the Windows adb build.
2015-04-19 20:49:08 +00:00
Elliott Hughes
924869d4ee
am 34c91edd: Merge "Fix the Windows adb build."
...
* commit '34c91eddb09ab86ffe6c965b25c5253c37ded227':
Fix the Windows adb build.
2015-04-19 20:39:09 +00:00
Elliott Hughes
34c91eddb0
Merge "Fix the Windows adb build."
2015-04-19 20:30:26 +00:00
Elliott Hughes
53daee6a2b
Fix the Windows adb build.
...
It looks like we can't use clang on Windows yet because libc++ isn't ready.
So move back to GCC for the Windows host clang. Work around the mingw
printf format string problems that made us want to switch to clang in the
first place, and #include "sysdeps.h" in adb_utils.cpp to work around the
absence of lstat(2) on Windows.
Change-Id: Icd0797a8c0c2d1d326bdd704ba6bcafcbaeb742f
2015-04-19 13:17:01 -07:00
Elliott Hughes
3fc3a67c53
am 835df4ae: am f08baf82: am 623aa1c4: Merge "Use escape_arg in "adb backup"."
...
* commit '835df4aebc9ec81ae97c792119796abef3057f5d':
Use escape_arg in "adb backup".
2015-04-18 04:23:28 +00:00
Elliott Hughes
835df4aebc
am f08baf82: am 623aa1c4: Merge "Use escape_arg in "adb backup"."
...
* commit 'f08baf8212de9ac65eb5b3ad2e6c3821d0b5faaf':
Use escape_arg in "adb backup".
2015-04-18 03:58:50 +00:00
Elliott Hughes
5498adefb0
Use ' quoting to escape arguments.
...
The specific motivating case is "text;ls;1.apk", but rather than continue
adding individual characters to the list of characters to be escaped, let's
just switch to quote all arguments with ', which only leaves ' itself to be
escaped.
Bug: 20323053
Bug: 19734868
Change-Id: I8bd71db9373bc2d1169fc11e46c889da6638550a
2015-04-17 20:55:04 -07:00
Elliott Hughes
f08baf8212
am 623aa1c4: Merge "Use escape_arg in "adb backup"."
...
* commit '623aa1c47a51990259fbbc271d7f9f40046153fd':
Use escape_arg in "adb backup".
2015-04-18 03:47:53 +00:00
Elliott Hughes
623aa1c47a
Merge "Use escape_arg in "adb backup"."
2015-04-18 03:37:14 +00:00
Elliott Hughes
6c34bbaa68
Use escape_arg in "adb backup".
...
This doesn't fix the injection vulnerability, but it makes "adb backup"
no worse than the other commands, and lets me fix them all at once.
Bug: 20323053
Change-Id: I39843c065d9d738b6b7943b2ffd660e4a031cc36
2015-04-17 20:30:09 -07:00
Elliott Hughes
f2999ce988
am dd586f3e: am 613584a2: am 81fa3039: Merge "Remove yet more fixed-length buffers (and their overruns)."
...
* commit 'dd586f3e27e0bc5a75adc104c9144bc686bc08ca':
Remove yet more fixed-length buffers (and their overruns).
2015-04-18 01:42:50 +00:00
Elliott Hughes
dd586f3e27
am 613584a2: am 81fa3039: Merge "Remove yet more fixed-length buffers (and their overruns)."
...
* commit '613584a24bde3adbbc7ff003eb58328387ffb7c3':
Remove yet more fixed-length buffers (and their overruns).
2015-04-18 01:21:03 +00:00
Elliott Hughes
613584a24b
am 81fa3039: Merge "Remove yet more fixed-length buffers (and their overruns)."
...
* commit '81fa3039fa7b5c6a18747cf5bdac32a1c6091427':
Remove yet more fixed-length buffers (and their overruns).
2015-04-18 01:10:38 +00:00
Elliott Hughes
81fa3039fa
Merge "Remove yet more fixed-length buffers (and their overruns)."
2015-04-18 01:03:14 +00:00
Elliott Hughes
20795b420a
am cf3165bd: am 3621ee6f: am 340e62f0: Merge "Fix comment typo."
...
* commit 'cf3165bd97f322c8a71ce7f7fdb953975fc5c6e1':
Fix comment typo.
2015-04-18 01:01:53 +00:00
Elliott Hughes
a7090b94c1
Remove yet more fixed-length buffers (and their overruns).
...
Bug: 20317724
Change-Id: If137fc96f5f23576ccecd388ac87afefa47337c6
2015-04-17 17:58:35 -07:00
Elliott Hughes
cf3165bd97
am 3621ee6f: am 340e62f0: Merge "Fix comment typo."
...
* commit '3621ee6fdbca9ce405b20d4c9b94a7c444d13844':
Fix comment typo.
2015-04-18 00:39:05 +00:00
Elliott Hughes
3621ee6fdb
am 340e62f0: Merge "Fix comment typo."
...
* commit '340e62f05e27c7665641e68c5d0654e310e251fb':
Fix comment typo.
2015-04-18 00:28:51 +00:00
Elliott Hughes
340e62f05e
Merge "Fix comment typo."
2015-04-18 00:17:34 +00:00
Elliott Hughes
1daf86aa20
Fix comment typo.
...
Change-Id: I2d7082c44123e90d74b2669ab29d787b9aa64863
2015-04-17 17:08:16 -07:00
Elliott Hughes
2ce08c7f8b
am 54b3aa93: am c0e6eebf: am 8d2abbea: Merge "Switch adb over to clang."
...
* commit '54b3aa93edbc4aeb094c7767e943518d2e4416a8':
Switch adb over to clang.
2015-04-17 23:25:57 +00:00
Elliott Hughes
f71d818151
am cc51fab7: am a2fd3128: am 61a004c0: Merge "Fix more buffer overruns."
...
* commit 'cc51fab7e15489e59a09e92ba39a5eec17493e20':
Fix more buffer overruns.
2015-04-17 23:04:42 +00:00
Elliott Hughes
54b3aa93ed
am c0e6eebf: am 8d2abbea: Merge "Switch adb over to clang."
...
* commit 'c0e6eebfae9818201ed4ad0d4aa5487f85a978ab':
Switch adb over to clang.
2015-04-17 23:04:19 +00:00