Mark Salyzyn
b098418872
Merge "logcat: test: rotated logs can exceed size during crash" am: 55c636a29f
...
am: 0b57d1efcc
2015-12-18 21:05:46 +00:00
Mark Salyzyn
964cc66e45
Merge "logd: test drop __unused" am: fb9ff0e8ad
...
am: 0f33cfab28
2015-12-18 21:05:40 +00:00
Mark Salyzyn
0b57d1efcc
Merge "logcat: test: rotated logs can exceed size during crash"
...
am: 55c636a29f
2015-12-18 20:40:38 +00:00
Mark Salyzyn
0f33cfab28
Merge "logd: test drop __unused"
...
am: fb9ff0e8ad
2015-12-18 20:40:31 +00:00
Tim Murray
5ecd7689d2
resolve merge conflicts of e9cf477488 to mnc-dr2-dev-plus-aosp.
...
am: 430a5d3b43
2015-12-18 20:05:41 +00:00
Tim Murray
430a5d3b43
resolve merge conflicts of e9cf477488 to mnc-dr2-dev-plus-aosp.
...
Change-Id: I162578bdbb831c0442df03cee142dbc9df657799
2015-12-18 11:27:33 -08:00
Tim Murray
e9cf477488
resolve merge conflicts of 14b307fa47 to mnc-dr2-dev.
...
Change-Id: I82f17b717b509553389185e6bc9886c105fcd59d
2015-12-18 10:55:00 -08:00
Mark Salyzyn
75594b4f13
Merge "logd: ro.config.low_ram set buffer size to 64K" am: 236fecd923
...
am: 6773967938
2015-12-18 18:41:08 +00:00
Elliott Hughes
f6e7622aea
Merge "adb host: add device state in "adb wait-for-*"" am: 82509e7925
...
am: ba7a198c29
2015-12-18 18:40:17 +00:00
Josh Gao
3f165e8d5b
Merge "adb: extract USB FFS read/write limit constants." am: 1ff73936a7
...
am: 67a6d861ce
2015-12-18 18:39:54 +00:00
Elliott Hughes
c85c7e84cc
Merge "Improve "adb install"\'s error message slightly." am: d361582dc0
...
am: 79abeb68f2
2015-12-18 18:39:33 +00:00
Mark Salyzyn
55c636a29f
Merge "logcat: test: rotated logs can exceed size during crash"
2015-12-18 18:37:33 +00:00
Mark Salyzyn
fb9ff0e8ad
Merge "logd: test drop __unused"
2015-12-18 18:36:47 +00:00
Mark Salyzyn
8beb0d3ad7
logcat: test: rotated logs can exceed size during crash
...
Some crash messages can be as large as 4K, so allow
the rotated logs to have a larger size.
Change-Id: I20ef8d526ad2d5eca128d1f99f4ea2d2da426403
2015-12-18 10:35:20 -08:00
Mark Salyzyn
7b4a2049b0
logd: test drop __unused
...
Change-Id: I1ccf49809b8a0a125601bdb52834c463e2d94165
2015-12-18 10:35:00 -08:00
Jorge Lucangeli Obes
135405fd20
Merge "adb: Use Minijail for privilege dropping." am: 297a8381b5
...
am: f733d6acad
2015-12-18 01:52:10 +00:00
Tom Cherry
065c723db2
Merge "Use selinux_android_setcon() instead of setcon()" am: 64cc0825a6
...
am: 4692984e92
2015-12-18 01:48:52 +00:00
Mark Salyzyn
6773967938
Merge "logd: ro.config.low_ram set buffer size to 64K"
...
am: 236fecd923
2015-12-17 23:54:40 +00:00
Mark Salyzyn
236fecd923
Merge "logd: ro.config.low_ram set buffer size to 64K"
2015-12-17 23:47:14 +00:00
Elliott Hughes
ba7a198c29
Merge "adb host: add device state in "adb wait-for-*""
...
am: 82509e7925
2015-12-17 22:50:16 +00:00
Elliott Hughes
82509e7925
Merge "adb host: add device state in "adb wait-for-*""
2015-12-17 22:44:15 +00:00
Josh Gao
67a6d861ce
Merge "adb: extract USB FFS read/write limit constants."
...
am: 1ff73936a7
2015-12-17 14:34:57 -08:00
Josh Gao
1ff73936a7
Merge "adb: extract USB FFS read/write limit constants."
2015-12-17 22:29:12 +00:00
Josh Gao
ae72b5aa4b
adb: extract USB FFS read/write limit constants.
...
Change-Id: I5e9fb7959a1c4744cb8d53ece4634138239d4e49
2015-12-17 14:28:24 -08:00
Elliott Hughes
79abeb68f2
Merge "Improve "adb install"\'s error message slightly."
...
am: d361582dc0
2015-12-17 22:22:33 +00:00
Elliott Hughes
d361582dc0
Merge "Improve "adb install"'s error message slightly."
2015-12-17 22:17:38 +00:00
Elliott Hughes
fe01885c9b
Improve "adb install"'s error message slightly.
...
We still don't really have a clue what went wrong, but "Failed to write"
made it sound like we did.
Change-Id: Ic58b13202e2d8ea6b095f7046db9d0771d77ce65
2015-12-17 14:04:38 -08:00
Tim Murray
14b307fa47
Merge "Fix logspam from system-background cpuset." into mnc-dr1.5-dev
2015-12-17 21:46:29 +00:00
Tim Murray
d31cb63db4
Fix logspam from system-background cpuset.
...
system-background can't be opened by most processes, since system-bg is
a privileged cpuset. Remove the log message when it can't be
opened. We'll still log a failure to use the fd if we try to use it
after it can't be opened, which is fine.
bug 26249842
Change-Id: I99f185c51645bc81b6a41732848227c27675cdf7
2015-12-17 13:11:50 -08:00
Jorge Lucangeli Obes
f733d6acad
Merge "adb: Use Minijail for privilege dropping."
...
am: 297a8381b5
2015-12-17 19:47:05 +00:00
Jorge Lucangeli Obes
297a8381b5
Merge "adb: Use Minijail for privilege dropping."
2015-12-17 19:39:47 +00:00
Jorge Lucangeli Obes
683dc4817f
adb: Use Minijail for privilege dropping.
...
By using Minijail we avoid writing the same priv-dropping code over
and over again. This also enables future hardening opportunities.
We're already using Minijail for priv-dropping on Brillo.
Minijail is unit- and integration-tested on the
Chrome OS CI infrastructure (pulling from the same repo, see
https://wmatrix.googleplex.com/security?tests=security_Minijail0 ).
Once CI comes to Android, it will be continuously tested there as well.
Both 'adb root' and 'adb unroot' still work.
Bug: 26099611
Change-Id: I52c456ea272d27bd6fbc71200f4fdd928a592158
2015-12-17 10:49:53 -08:00
Tom Cherry
4692984e92
Merge "Use selinux_android_setcon() instead of setcon()"
...
am: 64cc0825a6
2015-12-17 10:06:03 -08:00
Tom Cherry
64cc0825a6
Merge "Use selinux_android_setcon() instead of setcon()"
2015-12-17 17:54:05 +00:00
Leo Sartre
1fbc9dbd0f
adb host: add device state in "adb wait-for-*"
...
The current implementation of the host commands "adb wait-for-*" allows
to specify only the transport layer (local, usb or any).
This patch allows the specification of the expected device state
(bootloader, recovery, device or sideload), this is usefull for
scripting purposes.
Use case:
$ adb reboot sideload-auto-reboot
$ adb wait-for-usb-sideload && adb sideload package.zip
Change-Id: I276a6be4d82f8b7901f74e1e5395b86d16548e8f
Signed-off-by: Leo Sartre <leox.sartre@intel.com>
2015-12-16 18:11:18 -08:00
Tom Cherry
38cd57a145
Use selinux_android_setcon() instead of setcon()
...
Bug 26114086
Change-Id: I02d20ee7a5f487fc73d7a33d50b0b8f1cd9ad3a4
2015-12-16 17:42:08 -08:00
David Pursell
e19a7980b8
Merge "fastboot: implement UDP networking interface." am: b6dfab03b6
...
am: 9526f21b56
2015-12-17 00:42:27 +00:00
David Pursell
9526f21b56
Merge "fastboot: implement UDP networking interface."
...
am: b6dfab03b6
2015-12-17 00:36:53 +00:00
David Pursell
b6dfab03b6
Merge "fastboot: implement UDP networking interface."
2015-12-17 00:27:06 +00:00
David Pursell
815c7beae7
fastboot: implement UDP networking interface.
...
This CL creates a UdpSocket class that provides a simple unified
interface to send and receive UDP packets for all platforms. Nothing
uses this interface yet except for tests.
The eventual goal is to implement a UDP protocol for fastboot, but it
makes the code much simpler and more modular if we handle the low-level
networking here independently of our custom fastboot protocol.
Some of the Windows code is similar to adb. I'd like to create a
library to hold the common functionality, but it is going to be a
little delicate to separate out the features unique to adb (e.g. the
custom file descriptor system), and I don't want to risk breaking
something in adb before the holiday break, so I'm hoping to get this in
for now and merge them early next year.
Tests are included in this CL to exercise this functionality using a
loopback connection.
Bug: http://b/26154763 .
Tests: `fastboot_test` loopback tests on Linux, Mac, and Windows 7.
Change-Id: I81d1b7ace8d864246b99f6c80b8e29f64b8aa375
2015-12-16 16:16:08 -08:00
Jeff Sharkey
10eeabc59b
Re-derive permissions after package changes. am: f7aad11c1c am: c22e31435d -s ours
...
am: 8fd865fb48
2015-12-16 14:20:48 -08:00
Nick Kralevich
2af9135b8a
Merge "trace-dev.c: more O_CLOEXEC" am: a8d3fdf4c6
...
am: 2dda6ac98d
2015-12-16 14:20:39 -08:00
Josh Gao
a61bd45f83
Merge "adb: split up reads longer than 16k." am: 56d7d4e85f
...
am: bf2c482b56
2015-12-16 14:20:33 -08:00
Alex Vakulenko
d7067831b3
Merge "Fix metricsd to conform to the lastest server schema" am: 2fcf449886
...
am: 6170653ce5
2015-12-16 14:20:27 -08:00
Jeff Sharkey
84f42bf8bb
Merge "Re-derive permissions after package changes." am: db72fe1772
...
am: e0e5922ec5
2015-12-16 14:20:21 -08:00
Jeff Sharkey
8fd865fb48
Re-derive permissions after package changes. am: f7aad11c1c
...
am: c22e31435d
2015-12-16 22:16:08 +00:00
Jeff Sharkey
c22e31435d
Re-derive permissions after package changes.
...
am: f7aad11c1c
2015-12-16 14:02:43 -08:00
Nick Kralevich
2dda6ac98d
Merge "trace-dev.c: more O_CLOEXEC"
...
am: a8d3fdf4c6
2015-12-16 21:50:01 +00:00
Nick Kralevich
a8d3fdf4c6
Merge "trace-dev.c: more O_CLOEXEC"
2015-12-16 21:40:32 +00:00
Josh Gao
bf2c482b56
Merge "adb: split up reads longer than 16k."
...
am: 56d7d4e85f
2015-12-16 21:02:50 +00:00
