Elliott Hughes
20dfbb0fd1
am fa66b4e1: Merge "Remove long-obsolete file."
...
* commit 'fa66b4e136e0baeb41311405635d5852048e6ce7':
Remove long-obsolete file.
2015-04-24 04:07:23 +00:00
Elliott Hughes
fa66b4e136
Merge "Remove long-obsolete file."
2015-04-24 03:59:05 +00:00
Elliott Hughes
2a87d2b155
Remove long-obsolete file.
...
Change-Id: I728cc13b4a7ac93f9c923d2fc9bda2bb65ffe99d
2015-04-23 20:57:12 -07:00
Elliott Hughes
2869398351
am 1a39a994: Merge "Correct magic number on umount2"
...
* commit '1a39a994d9c1d407fec17e0b9a00383d50c48085':
Correct magic number on umount2
2015-04-24 03:28:43 +00:00
Elliott Hughes
1a39a994d9
Merge "Correct magic number on umount2"
2015-04-24 03:21:43 +00:00
Elliott Hughes
ef68fd3f80
am d4656784: Merge "Make init re-exec itself for its SELinux domain transition."
...
* commit 'd46567848bfcdc8f2cbc3faeef487cf5c770b43a':
Make init re-exec itself for its SELinux domain transition.
2015-04-24 03:18:39 +00:00
Elliott Hughes
d46567848b
Merge "Make init re-exec itself for its SELinux domain transition."
2015-04-24 03:10:16 +00:00
William Roberts
4555b69f26
Correct magic number on umount2
...
The umount2 call was using the magic constant 2 which is
has a defined and proper macro in mount.h as MNT_DETATCH.
Change-Id: I4ca4a6d31cbf5495c545088e3d90a8894a9f912f
2015-04-24 01:13:35 +00:00
Mark Salyzyn
85a9566f7c
am 76520752: Merge "rootfs: init.rc start logd parse error"
...
* commit '765207524fcbe261686c5d96bc42ea3dcc124f0a':
rootfs: init.rc start logd parse error
2015-04-23 22:34:48 +00:00
Mark Salyzyn
765207524f
Merge "rootfs: init.rc start logd parse error"
2015-04-23 22:25:30 +00:00
Elliott Hughes
adf0d1bbfa
Make init re-exec itself for its SELinux domain transition.
...
Change-Id: I38adabe5789d671e3f7d21936071a758ec8cea8a
2015-04-23 15:20:51 -07:00
Mark Salyzyn
9d4b3010b5
am 2ce1d81f: Merge "liblog: __android_log_is_loggable support Developer Options"
...
* commit '2ce1d81fd412657c14a14dd43ec570ac65cc1874':
liblog: __android_log_is_loggable support Developer Options
2015-04-23 21:16:40 +00:00
Mark Salyzyn
2ce1d81fd4
Merge "liblog: __android_log_is_loggable support Developer Options"
2015-04-23 21:06:31 +00:00
Mark Salyzyn
2766099959
am 653f9581: Merge "logd: per UID less aggressive 12.5% threshold"
...
* commit '653f9581bf32cc2532c2b1d442d7bb2bbf0c173e':
logd: per UID less aggressive 12.5% threshold
2015-04-23 14:50:42 +00:00
Mark Salyzyn
653f9581bf
Merge "logd: per UID less aggressive 12.5% threshold"
2015-04-23 14:41:48 +00:00
Mark Salyzyn
f94727b4c6
am 40502e1a: Merge "logd: ratelimit drop messages to 1/sec"
...
* commit '40502e1a70a0705ee9fbc50951bfae3c6b662632':
logd: ratelimit drop messages to 1/sec
2015-04-23 14:38:52 +00:00
Mark Salyzyn
40502e1a70
Merge "logd: ratelimit drop messages to 1/sec"
2015-04-23 14:30:44 +00:00
Elliott Hughes
d1eec0de6a
am 876881b2: Merge "Add missing null checks after allocations."
...
* commit '876881b22ad5d735cdb3ae2ac1afa6c336378808':
Add missing null checks after allocations.
2015-04-22 20:17:35 +00:00
Elliott Hughes
876881b22a
Merge "Add missing null checks after allocations."
2015-04-22 20:05:46 +00:00
Mark Salyzyn
e06a6e0f26
logd: ratelimit drop messages to 1/sec
...
Bug: 20334069
Bug: 20370119
Change-Id: I6f850aec46c4df1c99a5b1f28db75d071e134ad5
2015-04-22 11:58:37 -07:00
Mark Salyzyn
d717d805d4
logd: per UID less aggressive 12.5% threshold
...
Per-UID quota has a threshold of 12.5% of the total log size.
If less than that space is taken by the UID, then we
will not engage the pruning based on worst UID.
Change-Id: I9f15c9a26938f1115eb75e9c28ddb073e7680e06
2015-04-22 11:53:29 -07:00
Mark Salyzyn
1f028b2fdf
liblog: __android_log_is_loggable support Developer Options
...
- If logd.tag.<tag> is not found, check if persist.logd.tag.<tag> is available
- Do not turn off the isLoggable functionality on "user" builds
Bug: 19544788
Bug: 17760225
Change-Id: I3fec67b547aa431438965519507033798398e1e1
2015-04-22 10:39:39 -07:00
Richard Uhler
68f3a5a09f
am f75f16a1: Merge "Fix typos in comments"
...
* commit 'f75f16a1ddbe6cde5e44036d48dc7a6c62d38cc0':
Fix typos in comments
2015-04-22 16:17:31 +00:00
Richard Uhler
f75f16a1dd
Merge "Fix typos in comments"
2015-04-22 16:07:22 +00:00
Elliott Hughes
421d01c895
am d4196ef8: Merge "Add a command to call libnetutils\' do_dhcp."
...
* commit 'd4196ef88757a87af41c0f7ee6ed7bfc3802c9c7':
Add a command to call libnetutils' do_dhcp.
2015-04-22 02:57:58 +00:00
Elliott Hughes
d4196ef887
Merge "Add a command to call libnetutils' do_dhcp."
2015-04-22 02:50:13 +00:00
Elliott Hughes
dc3b459ff9
Add missing null checks after allocations.
...
Bug: http://b/20317729
Change-Id: I62bb761d48ee59a1f4ddd0cdd0632432305ca2ca
2015-04-21 19:43:22 -07:00
Elliott Hughes
9ab372eb22
Add a command to call libnetutils' do_dhcp.
...
Useful for wifi bringup.
Change-Id: Ib1d1b1d15cb9ce57119457a780e169b8f98987c2
2015-04-21 19:31:43 -07:00
Elliott Hughes
99355ffbdf
am 0fb33b3c: Merge "Plumb more of the error reporting through."
...
* commit '0fb33b3c05a0c935e17ae93dbe474f816cec666b':
Plumb more of the error reporting through.
2015-04-22 01:27:36 +00:00
Elliott Hughes
0fb33b3c05
Merge "Plumb more of the error reporting through."
2015-04-22 01:20:36 +00:00
Elliott Hughes
1555147bc4
Plumb more of the error reporting through.
...
This doesn't fix the bug, but it does flatten the bug to the well-known
and long-standing "adb shell" doesn't return exit statuses, so when we
fix that, this one will fix itself.
Bug: http://b/20423886
Change-Id: I48351e46f05dd3f2f6e57f0df1d851333458d0ef
2015-04-21 17:58:55 -07:00
Elliott Hughes
14000a3a35
am 9a0cea92: Merge "Add a couple more adb shell regression tests."
...
* commit '9a0cea92c8b74114b70ac3339b2b611633f6a31a':
Add a couple more adb shell regression tests.
2015-04-21 23:45:59 +00:00
Elliott Hughes
9a0cea92c8
Merge "Add a couple more adb shell regression tests."
2015-04-21 23:35:06 +00:00
Elliott Hughes
8e6edc0d89
Add a couple more adb shell regression tests.
...
Bug: http://b/15479704
Change-Id: Id3e7f0df101ad61db509df313c13210a8bd8b124
2015-04-21 16:25:54 -07:00
Michael Wright
a7d470920f
am a75b3de2: Merge "Mark time conversion functions as constexpr"
...
* commit 'a75b3de2c235d6adcee0aadcc9ecc718fd784c05':
Mark time conversion functions as constexpr
2015-04-21 22:44:02 +00:00
Mark Salyzyn
f2cd84d37c
am 088c4f3b: Merge "logd: Statistics headers"
...
* commit '088c4f3b8a0933fd6b3262764b54f4751155c7d1':
logd: Statistics headers
2015-04-21 22:44:01 +00:00
Badhri Jagan Sridharan
fade90ac20
am 82b0f7ba: Merge "adb: set sys.usb.ffs.ready to signal usb pullup"
...
* commit '82b0f7ba9258c74e4019b2b6478d2e1623a287d9':
adb: set sys.usb.ffs.ready to signal usb pullup
2015-04-21 22:44:00 +00:00
Elliott Hughes
5f509c78cb
am da60a30b: Merge "Add a test for shell escaping."
...
* commit 'da60a30b86d33b4e4e49d790dc3607c415fff91e':
Add a test for shell escaping.
2015-04-21 22:43:59 +00:00
Elliott Hughes
39ce837d1e
am 9f2944aa: Merge "Remove dead code."
...
* commit '9f2944aab0420343dd6e2cbeb3a6e3639e374613':
Remove dead code.
2015-04-21 22:43:58 +00:00
Elliott Hughes
fc28ac17a3
am 6a2d5a34: Merge "Fix "adb sync" for devices without vendor and oem."
...
* commit '6a2d5a34e81b75ac61337d401aab16bf917b47b1':
Fix "adb sync" for devices without vendor and oem.
2015-04-21 22:43:56 +00:00
Elliott Hughes
c1557acbd9
am e434ad1d: Merge "Always explain why bind(2) failed."
...
* commit 'e434ad1dd799551830019a7bd2871dec226bdcd2':
Always explain why bind(2) failed.
2015-04-21 22:43:55 +00:00
Elliott Hughes
a9caadf8bd
am 14b65736: Merge "Use \' quoting to escape arguments."
...
* commit '14b65736c5ed487ebba93d3ccc3e261ece71f833':
Use ' quoting to escape arguments.
2015-04-21 22:43:54 +00:00
Michael Wright
a75b3de2c2
Merge "Mark time conversion functions as constexpr"
2015-04-21 21:50:28 +00:00
Mark Salyzyn
088c4f3b8a
Merge "logd: Statistics headers"
2015-04-21 20:13:15 +00:00
Badhri Jagan Sridharan
82b0f7ba92
Merge "adb: set sys.usb.ffs.ready to signal usb pullup"
2015-04-21 19:58:46 +00:00
Elliott Hughes
da60a30b86
Merge "Add a test for shell escaping."
2015-04-21 19:48:06 +00:00
Badhri Jagan Sridharan
5f97370bab
adb: set sys.usb.ffs.ready to signal usb pullup
...
This change sets sys.usb.ffs.ready to 1 to
trigger configfs based enumeration.
Change-Id: I222495fc667cce59675579069d164b0b484f3653
2015-04-21 12:44:31 -07:00
Elliott Hughes
9f2944aab0
Merge "Remove dead code."
2015-04-21 19:34:34 +00:00
Elliott Hughes
d5ff3e9449
Remove dead code.
...
We weren't even building this.
Change-Id: I8b2afbc76d784a7b24bbe0be6502b9fbcf0b5c09
2015-04-21 12:24:50 -07:00
Elliott Hughes
0053bb3f1a
Add a test for shell escaping.
...
Until I fixed this, we would fail this example:
$ adb shell sh -c 'echo hello; echo world'
hello
/system/bin/sh: echo world: not found
Bug: http://b/19734868
Change-Id: I11a437cd0c0362303028f23fbaa103611b75707e
2015-04-21 12:15:31 -07:00