Commit graph

22776 commits

Author SHA1 Message Date
Yabin Cui
eee0b01a11 Merge "Fix kick_transport test." am: a960864 am: 119ca23
am: 2f46a7d

* commit '2f46a7d0ecdbff4cc8f08d2f63e855dde681cb25':
  Fix kick_transport test.

Change-Id: Iaa7282c15324e1e2e3aab03ba199d0527c07d0e2
2016-04-19 03:04:09 +00:00
Yabin Cui
2f46a7d0ec Merge "Fix kick_transport test." am: a960864
am: 119ca23

* commit '119ca2345d97db04d4114f5031d172f3694350d4':
  Fix kick_transport test.

Change-Id: I4625174a1d62edfa8a1db52ced70356798d53c95
2016-04-19 02:57:56 +00:00
Yabin Cui
119ca2345d Merge "Fix kick_transport test."
am: a960864

* commit 'a960864355d40fc4d56d2317c99fb4df13a1baa7':
  Fix kick_transport test.

Change-Id: Ib64e59304d7dbe6b0b1b5c1dbd2ee593ff98ca97
2016-04-19 02:38:08 +00:00
Yabin Cui
a960864355 Merge "Fix kick_transport test." 2016-04-19 02:29:29 +00:00
Josh Gao
bd596375f6 Merge changes Ia4a2ff77,I970806e3,I47daa338 into nyc-dev am: a9e818f463
am: 149f39c0aa

* commit '149f39c0aaa4bbe655874d3e7904ffe36005612a':

Change-Id: I4b7fe3b9751ca003ba4a77f4915bbf60867d52ad
2016-04-19 00:58:36 +00:00
Josh Gao
1ebd5aa9dc Merge changes Ia4a2ff77,I970806e3,I47daa338 into nyc-dev am: a9e818f463
am: fad1cd0edd

* commit 'fad1cd0eddc6f16ec53eb786c455aa94341c37c7':
  adb: increase the FD table size on Win32.
  adb: bump the server version to 36.
  adb: add reconnect command.

Change-Id: If58944e776ee0ac78a498d83876021563a40029a
2016-04-19 00:58:04 +00:00
Josh Gao
149f39c0aa Merge changes Ia4a2ff77,I970806e3,I47daa338 into nyc-dev
am: a9e818f463

* commit 'a9e818f4632eca67a5ffd1fb680d15550591ecd9':
  adb: increase the FD table size on Win32.
  adb: bump the server version to 36.
  adb: add reconnect command.

Change-Id: I69178c16e133dbf6a293e45f82de5481b0c014b9
2016-04-19 00:56:00 +00:00
Josh Gao
fad1cd0edd Merge changes Ia4a2ff77,I970806e3,I47daa338 into nyc-dev
am: a9e818f463

* commit 'a9e818f4632eca67a5ffd1fb680d15550591ecd9':
  adb: increase the FD table size on Win32.
  adb: bump the server version to 36.
  adb: add reconnect command.

Change-Id: Ice1518eba0fdd0430ce191ca2afc6bc553ebe4b8
2016-04-19 00:55:58 +00:00
TreeHugger Robot
a9e818f463 Merge changes Ia4a2ff77,I970806e3,I47daa338 into nyc-dev
* changes:
  adb: increase the FD table size on Win32.
  adb: bump the server version to 36.
  adb: add reconnect command.
2016-04-19 00:51:22 +00:00
Mark Salyzyn
347f610c8f Merge "liblog: android_log_isloggable failing apct" am: 0d4661d am: cee2ce6755
am: ab162d6cb2

* commit 'ab162d6cb20f79baed453a20bde4b0e4c87fc9d3':
  liblog: android_log_isloggable failing apct

Change-Id: If6a872234bef321cc86077f734815e8c7cc8508f
2016-04-19 00:31:11 +00:00
Josh Gao
e55e39f2f0 Merge changes Iaf0efc0c,Ia4a2ff77 am: c4f3546 am: c5b388f53a
am: 826bdace3d

* commit '826bdace3d756055560643e831ccf91fbc5e6bc8':
  adb: disable tests that are expected to fail on Win32.
  adb: increase the FD table size on Win32.

Change-Id: I083ab867691b4f2b1fbf3a594eb2d2811a13123d
2016-04-19 00:31:11 +00:00
Mark Salyzyn
ab162d6cb2 Merge "liblog: android_log_isloggable failing apct" am: 0d4661d
am: cee2ce6755

* commit 'cee2ce6755d032c494be4295e98064b3b40ffa51':
  liblog: android_log_isloggable failing apct

Change-Id: I2cddfa04aff9a39ec897a75408a3f63c38692f4a
2016-04-19 00:28:59 +00:00
Josh Gao
826bdace3d Merge changes Iaf0efc0c,Ia4a2ff77 am: c4f3546
am: c5b388f53a

* commit 'c5b388f53a5666daa368f597c7e190f7f31f2b8a':
  adb: disable tests that are expected to fail on Win32.
  adb: increase the FD table size on Win32.

Change-Id: Ifcc55e62935c95c8b34fa0d1973277a08916fad2
2016-04-19 00:28:58 +00:00
Mark Salyzyn
cee2ce6755 Merge "liblog: android_log_isloggable failing apct"
am: 0d4661d

* commit '0d4661d54927101cc1dd1964ac146239f5f054ac':
  liblog: android_log_isloggable failing apct

Change-Id: I1cb1c62ee21175fab77ed0aa81b6420b69da3909
2016-04-18 23:27:07 +00:00
Treehugger Robot
0d4661d549 Merge "liblog: android_log_isloggable failing apct" 2016-04-18 23:22:40 +00:00
Josh Gao
c5b388f53a Merge changes Iaf0efc0c,Ia4a2ff77
am: c4f3546

* commit 'c4f3546e9ff410bf106ba6d97231be40e24e1adb':
  adb: disable tests that are expected to fail on Win32.
  adb: increase the FD table size on Win32.

Change-Id: I4883966f32de7cc4fbbec0e0942e667d8eeee9f6
2016-04-18 22:47:22 +00:00
Josh Gao
d1e2300a71 adb: increase the FD table size on Win32.
128 maximum FDs is a pretty low limit, which can easily be exhausted by
port forwarding. Bump the maximum up to 2048, and add a test that checks
whether we can actually use a few hundred sockets.

Bug: https://code.google.com/p/android/issues/detail?id=12141
Bug: http://b/28246942
Change-Id: Ia4a2ff776e8e58ec13378756f19d80392679ece9
(cherry picked from commit b31e17107c)
2016-04-18 15:46:25 -07:00
Josh Gao
988e9bc1f8 adb: bump the server version to 36.
The recent `adb root` changes are incompatible with older versions of
the server. Bump the version number to force the server to restart.

Bug: http://b/28194507
Change-Id: I970806e3b68c1f8e3273a4b1f0ecc4aca5086be9
(cherry picked from commit 057095d207)
2016-04-18 15:46:25 -07:00
Yabin Cui
03468c8c50 adb: add reconnect command.
Add reconnect command for debugging. `reconnect` kicks a transport
from the host side, `reconnect device` kicks a transport from
the device side. They can be used to produce transport errors.

Bug: 25935458

Change-Id: I47daa338796b561941e7aba44a51a6dd117d1e98
(cherry picked from commit 1f4ec19e49)
2016-04-18 15:46:25 -07:00
Josh Gao
c4f3546e9f Merge changes Iaf0efc0c,Ia4a2ff77
* changes:
  adb: disable tests that are expected to fail on Win32.
  adb: increase the FD table size on Win32.
2016-04-18 22:39:34 +00:00
Josh Gao
56c6e9dd0e Merge "adb: bump the server version to 36." am: 3009b7c am: a0b5c62
am: e929e11

* commit 'e929e115bef6a7129bd18c33fb32c5f2eebdcf02':
  adb: bump the server version to 36.

Change-Id: Ided3bd4cafdd1893d38542563aabe904c740eb50
2016-04-18 21:36:21 +00:00
Josh Gao
68c63d75c9 adb: disable tests that are expected to fail on Win32.
Bug: http://b/28247676
Change-Id: Iaf0efc0c12835c0915a752a365651eb9bc78b3b8
2016-04-18 14:33:38 -07:00
Josh Gao
b31e17107c adb: increase the FD table size on Win32.
128 maximum FDs is a pretty low limit, which can easily be exhausted by
port forwarding. Bump the maximum up to 2048, and add a test that checks
whether we can actually use a few hundred sockets.

Bug: https://code.google.com/p/android/issues/detail?id=12141
Bug: http://b/28246942
Change-Id: Ia4a2ff776e8e58ec13378756f19d80392679ece9
2016-04-18 14:33:38 -07:00
Josh Gao
e929e115be Merge "adb: bump the server version to 36." am: 3009b7c
am: a0b5c62

* commit 'a0b5c62525e7b79131df337619b268794c92374f':
  adb: bump the server version to 36.

Change-Id: I910cd4e32bd38796025d603ee86d245d33f6c61a
2016-04-18 21:29:41 +00:00
Jeff Sharkey
21aca474b7 Merge "Create legacy /data/system/user directory." into nyc-dev am: e4f870a
am: 0ef5c5c

* commit '0ef5c5cb203eae0656f86e500274eb5bd856b88c':

Change-Id: I31ed0564c7d05be8fc845d883fa49824bc706cc9
2016-04-18 20:15:05 +00:00
Josh Gao
a0b5c62525 Merge "adb: bump the server version to 36."
am: 3009b7c

* commit '3009b7cbe017e0d6f87d31b52a32bdc8fa77b095':
  adb: bump the server version to 36.

Change-Id: I60a8d01fa2da411d1417d186bb93941ceed33418
2016-04-18 20:14:39 +00:00
Jeff Sharkey
1b59b815ba Merge "Create legacy /data/system/user directory." into nyc-dev am: e4f870a
am: 2a9974a

* commit '2a9974a9682291f4e7dcbb2e940ac2e42a0d6c2c':
  Create legacy /data/system/user directory.

Change-Id: I20b29a6fb802966be184cb78534b4dd7d36eee66
2016-04-18 20:05:44 +00:00
Josh Gao
3009b7cbe0 Merge "adb: bump the server version to 36." 2016-04-18 20:05:42 +00:00
Jeff Sharkey
2a9974a968 Merge "Create legacy /data/system/user directory." into nyc-dev
am: e4f870a

* commit 'e4f870a0bb260f351208b9fe3cf7334e58c16a14':
  Create legacy /data/system/user directory.

Change-Id: Idd0b668f5e88afc928b74d9d45110a932dd0713d
2016-04-18 19:59:34 +00:00
Jeff Sharkey
0ef5c5cb20 Merge "Create legacy /data/system/user directory." into nyc-dev
am: e4f870a

* commit 'e4f870a0bb260f351208b9fe3cf7334e58c16a14':
  Create legacy /data/system/user directory.

Change-Id: I9b18134310c101974eb353d635c9cc8f8488877f
2016-04-18 19:59:34 +00:00
Jeff Sharkey
e4f870a0bb Merge "Create legacy /data/system/user directory." into nyc-dev 2016-04-18 19:43:18 +00:00
Yabin Cui
7f27490e7f Fix kick_transport test.
Fix broken kick_transport test, and make it not access atransport
internal variables.

Bug: 25935458
Change-Id: I91b4d32a222b2f369f801bbe3903acac9c8ea4f7
2016-04-18 11:22:34 -07:00
Elliott Hughes
b1b71132ae Merge "Remove toolbox iftop." am: b1393e9 am: a0d08bb
am: 9de1b0c

* commit '9de1b0ccd493effccbbe43b135373ca5948ddc45':
  Remove toolbox iftop.

Change-Id: Ic4cf7f47ff006f68990e2a07da79ac2e0f944b10
2016-04-18 17:57:25 +00:00
Elliott Hughes
9de1b0ccd4 Merge "Remove toolbox iftop." am: b1393e9
am: a0d08bb

* commit 'a0d08bbb2fd8b2650a00cdd24af0a62fe0a3e8fc':
  Remove toolbox iftop.

Change-Id: I580509a50367430993c8de7a13bb8b70fd34436b
2016-04-18 17:52:12 +00:00
Elliott Hughes
a0d08bbb2f Merge "Remove toolbox iftop."
am: b1393e9

* commit 'b1393e93ad7e4540bd0f1c2700b8beec9837427d':
  Remove toolbox iftop.

Change-Id: Ia111161a8d716f1eb630dffb736e8c1c83a62629
2016-04-18 17:46:50 +00:00
Elliott Hughes
b1393e93ad Merge "Remove toolbox iftop." 2016-04-18 17:38:36 +00:00
Christopher Wiley
9737a98824 Merge "Export libbinder headers from libhealhd.default" am: c2241b9 am: a10b760
am: 447ae54

* commit '447ae54e3f9bda337843ced69970d213af9b98d5':
  Export libbinder headers from libhealhd.default

Change-Id: Id78d578cd84774e1971268e8442d3d17222b3f2a
2016-04-18 17:20:27 +00:00
Christopher Wiley
447ae54e3f Merge "Export libbinder headers from libhealhd.default" am: c2241b9
am: a10b760

* commit 'a10b760d28ee0327d84dd73a16a83927d695eb56':
  Export libbinder headers from libhealhd.default

Change-Id: Idad9032e89102e912240a3d26955d3f7893e0694
2016-04-18 17:15:08 +00:00
Christopher Wiley
a10b760d28 Merge "Export libbinder headers from libhealhd.default"
am: c2241b9

* commit 'c2241b9c5dbff5028558e658286c242c050594f8':
  Export libbinder headers from libhealhd.default

Change-Id: Ia85f8aa9f4e507f05386ff38bd7fabb106250ec1
2016-04-18 17:09:48 +00:00
Mark Salyzyn
3df3b3bdb2 Merge "logpersist: incorporate size and buffer tunables" am: a87467d am: af2c43a
am: ee39961

* commit 'ee39961311dbbbdcefbe4fcd4d98e52fa910e94b':
  logpersist: incorporate size and buffer tunables

Change-Id: Ie9494a32be1a70fd651b9991b82ad8be63bd5a31
2016-04-18 17:09:48 +00:00
Christopher Wiley
c2241b9c5d Merge "Export libbinder headers from libhealhd.default" 2016-04-18 17:04:49 +00:00
Treehugger Robot
ee39961311 Merge "logpersist: incorporate size and buffer tunables" am: a87467d
am: af2c43a

* commit 'af2c43abbbfce0dfe1a2fdb38d0abf705e0f5b73':
  logpersist: incorporate size and buffer tunables

Change-Id: I11a1f98e6b0c7e39cfb658a45ddcf9f3772a2985
2016-04-18 17:04:40 +00:00
Mark Salyzyn
af2c43abbb Merge "logpersist: incorporate size and buffer tunables"
am: a87467d

* commit 'a87467d767b0523fca5f8fcfda9a2afb59e8df4f':
  logpersist: incorporate size and buffer tunables

Change-Id: If38fc3ede8cd1c6e0683a5c5153b91c02d218355
2016-04-18 16:59:20 +00:00
Treehugger Robot
a87467d767 Merge "logpersist: incorporate size and buffer tunables" 2016-04-18 16:48:33 +00:00
Christopher Wiley
8ac71c7fc6 Export libbinder headers from libhealhd.default
Consumers of libhealthd.default will need these headers.

Bug: 27804373
Change-Id: I59e8526e3491f0db528d1277b8e2f4b68ce85805
Test: Compiles.
2016-04-18 09:33:53 -07:00
Mark Salyzyn
2e210e4650 logpersist: incorporate size and buffer tunables
- Add hidden -n and -b flags that propagate to the underlying
  logcat command. Publish aliases in help as --size and --buffer.
- Add --clear for start command so it clears before starting
- shell script bloating up to deal with option validation and
  provide ERROR: and WARNING: advice.

ToDo:

- Deprecate shell script and replace with Eng and Userdebug
  only Developer Options, before it becomes too powerful
  or bloated to force us to rewrite an expendable like this
  into C++.

Bug: 28120456
Change-Id: I0dff8acaa1e5c929454760cfa2801924956bc25d
2016-04-18 08:54:39 -07:00
Elliott Hughes
72886ce0af Remove toolbox iftop.
It's nothing like the real iftop, and there's no evidence anyone uses it.
In particular, it hasn't been touched since it was first checked in, back
in 2008. So it's either perfect or unused. Let's find out...

Change-Id: I941adbb67f0166b9b3bd796291060bd67eafa867
2016-04-16 09:08:05 -07:00
Yabin Cui
1a3ce9b3a6 Merge "adb: add reconnect command." am: 643bc36
am: 1dd696a

* commit '1dd696a52687106d9926374d18895a911cc6fd28':
  adb: add reconnect command.

Change-Id: Ibfdfe1675a8d3627d4fb8eef3592b9b836dc4d19
2016-04-16 02:00:33 +00:00
Yabin Cui
1dd696a526 Merge "adb: add reconnect command."
am: 643bc36

* commit '643bc369ef8dbeeb22ee87bfa04eb3621ffa16a2':
  adb: add reconnect command.

Change-Id: I4cf54a13d4fc31578d9b7f7084d92974e69c8d2a
2016-04-16 01:58:03 +00:00
Yabin Cui
643bc369ef Merge "adb: add reconnect command." 2016-04-16 01:50:54 +00:00