Commit graph

20195 commits

Author SHA1 Message Date
Chih-Hung Hsieh
6eaa91685f Merge "Fix google-runtime-int warnings."
am: 603df0e

* commit '603df0e875a43cb045e9235b95f8a883f1722f1d':
  Fix google-runtime-int warnings.

Change-Id: Idc70dd39818a14f11a6dd6fae7955700a0abac66
2016-04-19 16:21:46 +00:00
Chih-hung Hsieh
603df0e875 Merge "Fix google-runtime-int warnings." 2016-04-19 16:14:10 +00:00
Christopher Wiley
6590a92777 Merge "Define LIKELY and UNLIKELY in a vendor friendly way"
am: 7ed5194

* commit '7ed5194278dd9ffcda203dd3a8250c0cb2914d07':
  Define LIKELY and UNLIKELY in a vendor friendly way

Change-Id: Ie782284f30e731b6ee26b99c39e532b27210eaec
2016-04-19 15:44:11 +00:00
Treehugger Robot
7ed5194278 Merge "Define LIKELY and UNLIKELY in a vendor friendly way" 2016-04-19 15:24:14 +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
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
Christopher Wiley
ec9ea66a2b Define LIKELY and UNLIKELY in a vendor friendly way
This prevents macro conflicts with vendor code.

Bug: 27804373
Change-Id: I759c2b7b611203d0afdc35ddd5c2adb8f942ea17
Test: Compiles when libbinder include path changes to include libbase.
2016-04-18 16:08:19 -07: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
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
Chih-Hung Hsieh
ec2ff8c176 Fix google-runtime-int warnings.
Bug: 28220065
Change-Id: I6b8e121ddf98355d1c1ac034c2e3522b2b49e14b
2016-04-18 14:45:46 -07: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
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
Josh Gao
3009b7cbe0 Merge "adb: bump the server version to 36." 2016-04-18 20:05:42 +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
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
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
Christopher Wiley
c2241b9c5d Merge "Export libbinder headers from libhealhd.default" 2016-04-18 17:04:49 +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
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
David Benjamin
c49e943109 Merge "Fix include-what-you-use problem in android-pubkey.c."
am: ba430e3

* commit 'ba430e363427cb99af3afe06baec9360150255b2':
  Fix include-what-you-use problem in android-pubkey.c.

Change-Id: Iec27f1ba8e3c38874e20c377718c76c6885de4f1
2016-04-16 00:06:35 +00:00
Treehugger Robot
ba430e3634 Merge "Fix include-what-you-use problem in android-pubkey.c." 2016-04-16 00:01:39 +00:00
Josh Gao
057095d207 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
2016-04-15 14:54:43 -07:00
David Benjamin
2257f6baf5 Fix include-what-you-use problem in android-pubkey.c.
This fixes a problem building against BoringSSL master.

Change-Id: Ib052c6a59454126a83e32e9a43391470aca7356a
2016-04-15 17:44:05 -04:00
Mark Salyzyn
efe8ecc1d9 liblog: android_log_isloggable failing apct
- periodic failures in apct, dropped second serial test
  in refresh_cache, trusting check_cache or global.
- The retry loop to see if is_loggable recovers of 1000
  was hiding subsequent tests, drop to 10 retries.
- On the whole, the average performance remains the same.

Bug: 25792367
Change-Id: I4110440ef46671d7a1c128689bde623808bed04f
2016-04-15 11:04:24 -07:00
James Hawkins
db20ad1222 Merge "bootstat: Calculate and log the time_since_last_boot metric."
am: 1607ea6

* commit '1607ea64cbdeea766c05d033afe0c65ea978b399':
  bootstat: Calculate and log the time_since_last_boot metric.

Change-Id: I643c0847a75e4ba02db17ea5e4c716f6fcc7b28d
2016-04-15 16:48:43 +00:00
James Hawkins
1607ea64cb Merge "bootstat: Calculate and log the time_since_last_boot metric." 2016-04-15 16:46:52 +00:00
James Hawkins
2d8b3e66c6 bootstat: Calculate and log the time_since_last_boot metric.
Bug: 28163811
Change-Id: I2e1350531f6a0fc891c270cfdfca6c8ad63f8040
2016-04-15 08:44:01 -07:00
Yabin Cui
b1503248f4 Merge "libbacktrace: only build libbacktrace_offline static library."
am: f20e4b1

* commit 'f20e4b1b710d01fca7bfc41739058ef22c44e0f3':
  libbacktrace: only build libbacktrace_offline static library.

Change-Id: I6e00010154f97deefb9bcb9901b807e833eab9fb
2016-04-14 21:34:14 +00:00
Yabin Cui
f20e4b1b71 Merge "libbacktrace: only build libbacktrace_offline static library." 2016-04-14 21:14:55 +00:00
Yabin Cui
51e607056d libbacktrace: only build libbacktrace_offline static library.
As device may not have libbacktrace_offline shared library, simpleperf
no longer rely on it. So there is no reason to keep libbacktrace_offline
shared library.

Bug: 28152982
Change-Id: If8e31b1434646dbbfed60264eb25f034bc5d6946
2016-04-14 10:31:08 -07:00
Mark Salyzyn
3c1cd7022c Merge "logd: switch from android_ids to getpwuid"
am: 9a3e238

* commit '9a3e238a6052204ff44b81ea06b6a0874e2acff9':
  logd: switch from android_ids to getpwuid

Change-Id: Ief9baf28b1bfc062d205fd75f871323a28d6e1a8
2016-04-14 16:12:51 +00:00
Treehugger Robot
9a3e238a60 Merge "logd: switch from android_ids to getpwuid" 2016-04-14 16:06:08 +00:00
Elliott Hughes
98ab3c0ae7 Merge "Remove libmincrypt."
am: d93e7ca

* commit 'd93e7cacef54a2c7ab26071fca3982f6e60fd47c':
  Remove libmincrypt.

Change-Id: I7f8a0208aa0d3204ffd248041a14861d19636adc
2016-04-14 15:26:03 +00:00
Elliott Hughes
d93e7cacef Merge "Remove libmincrypt." 2016-04-14 15:19:06 +00:00
Mark Salyzyn
b8a95bd3c9 logd: switch from android_ids to getpwuid
Bug: 27999086
Change-Id: I7f4e68b21f58789b4dcada04f9c27f5722940c02
2016-04-14 15:14:46 +00:00
Daniel Rosenberg
c375b37c3a Merge "Add nofail fstab option"
am: e992831

* commit 'e99283103bbd06a2b8a40971ed161d9d0518f79e':
  Add nofail fstab option

Change-Id: Iada8393491847037b33e7de4ac5ccf3b7e9eba6f
2016-04-14 00:21:23 +00:00
Daniel Rosenberg
e99283103b Merge "Add nofail fstab option" 2016-04-14 00:12:44 +00:00
Mark Salyzyn
453139a2a0 Merge changes I7ebb6146,I0b42736c,I5331acde
am: df7c1ed

* commit 'df7c1ed3a06c60d77865ff8d71b2f30ca94693a7':
  logcat: expand -n, -r and -b
  logcat: allow comma-separate list of buffers
  logcat: Adjust help to make it more meaningful

Change-Id: I2341e07713e14e1e449bf41a194e306526246959
2016-04-13 21:45:32 +00:00
Mark Salyzyn
df7c1ed3a0 Merge changes I7ebb6146,I0b42736c,I5331acde
* changes:
  logcat: expand -n, -r and -b
  logcat: allow comma-separate list of buffers
  logcat: Adjust help to make it more meaningful
2016-04-13 21:32:48 +00:00
Josh Gao
c35de74b2b Merge changes Ibc8038b1,I1876ecd7,I57d70f8b
am: 3e0eaa4

* commit '3e0eaa4103f4497463dd8b5daa1ee7ffe3921211':
  adb: after `adb root`, wait for the device in any state.
  adb: add support for 'wait-for-any'.
  adb: make 'wait-for-{recovery,sideload,bootloader} work.

Change-Id: Ib54818926966cf01839b98a5ef772c3a3900fd38
2016-04-13 20:34:08 +00:00
Treehugger Robot
3e0eaa4103 Merge changes Ibc8038b1,I1876ecd7,I57d70f8b
* changes:
  adb: after `adb root`, wait for the device in any state.
  adb: add support for 'wait-for-any'.
  adb: make 'wait-for-{recovery,sideload,bootloader} work.
2016-04-13 20:25:53 +00:00