Commit graph

20178 commits

Author SHA1 Message Date
Treehugger Robot
bf1767fbed Merge "Fix google-explicit-constructor warnings." 2016-04-27 15:44:07 +00:00
Treehugger Robot
c2964402b6 Merge "adb: decrease the number of fds used in fd_count test." 2016-04-26 23:55:11 +00:00
Josh Gao
858f133d41 adb: decrease the number of fds used in fd_count test.
Default limit is 1024 fds, which means 512 socketpairs will hit the
limit.

Bug: http://b/28386497
Change-Id: Ib36404c050e4be3db51378e250f300f7ec5aab13
2016-04-26 15:45:23 -07:00
Treehugger Robot
52eb6025ed Merge "adb: fix test_device.py shell protocol checks." 2016-04-26 21:35:55 +00:00
Treehugger Robot
6b617c7c30 Merge "Don't hardcode gtest paths." 2016-04-26 21:19:51 +00:00
David Pursell
cf46741b4f adb: fix test_device.py shell protocol checks.
https://android-review.googlesource.com/#/c/210646/ added a
has_shell_protocol() function but the test_device.py tests were still
trying to use the now-missing SHELL_PROTOCOL_FEATURE constant.

This CL just switches test_device.py to correctly use the
has_shell_protocol() method.

Change-Id: Ie0a2f0dc07529843d25051a01e08fb677551a4e1
Test: `python -m unittest discover -v` on devices with and without
      the shell protocol.
2016-04-26 13:29:39 -07:00
Dan Albert
3df8c67d29 Don't hardcode gtest paths.
Bug: http://b/16574165
Change-Id: Icaf99a51c309db7eb5f8b051a5896b5f49e1b3bc
2016-04-26 13:28:23 -07:00
Treehugger Robot
64461c293c Merge "sdcard: avoid benign unsigned overflow" 2016-04-26 17:10:49 +00:00
Daniel Micay
df9c4a0166 sdcard: avoid benign unsigned overflow
Change-Id: Id9427b4e01602bba31f8958b8d491b092b31482b
2016-04-26 12:08:46 -04:00
Jorge Lucangeli Obes
58505e17bb Merge "Fix 'ps.c' formatting." 2016-04-26 03:39:53 +00:00
Yabin Cui
e998abde89 Merge "adb: fix socket tests." 2016-04-26 03:00:15 +00:00
Yabin Cui
2407d7c3d9 adb: fix socket tests.
Bug: 28386497

Change-Id: I9f37ecadf3cfc6bb4e5da502d40f49e1f3a16d8a
2016-04-25 19:51:58 -07:00
Chih-hung Hsieh
e1d5c2548b Merge "Fix google-explicit-constructor warnings." 2016-04-26 00:36:31 +00:00
Jorge Lucangeli Obes
5c1b3afbd4 Fix 'ps.c' formatting.
Insert a space between 'if'/'while' and their clause.
Also insert a space after ',' for arguments.

This was done with clang-format.

Bug: None

Change-Id: I5315eba3d5d8ac68996a373dc7c8e1bc45165824
2016-04-25 16:31:15 -07:00
Jorge Lucangeli Obes
47f808d09f Merge "Fix 'ps --ppid'." 2016-04-25 23:21:56 +00:00
Jorge Lucangeli Obes
c5e7f73bc6 Fix 'ps --ppid'.
Currently, 'ps' will segfault when called with '--ppid' and no argument.
Make it return an error instead.

Bug: 28383024

Change-Id: I71f2d1ba9502996ae75b17605234eb99ebb589f2
2016-04-25 15:54:12 -07:00
Chih-Hung Hsieh
75935ef67e Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: I0ce541f79feef5c08eac64edc686be3edf9c2aa4
2016-04-25 15:28:36 -07:00
Chih-hung Hsieh
f9660191f0 Merge "Fix google-explicit-constructor warnings." 2016-04-25 22:22:06 +00:00
Chih-Hung Hsieh
3a114e0a81 Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: I5d1988efc1563efbdb25c867713c54f41439a82a
2016-04-25 14:57:11 -07:00
Elliott Hughes
d2afbe45e1 Merge "GCC compiler warning fix for sprintf into snprintf" 2016-04-25 20:58:04 +00:00
Chih-Hung Hsieh
1cc82ce95c Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: I2cf746fd07addc6e6c22e98e2a5bb8a8ce47c885
2016-04-25 13:49:46 -07:00
Yabin Cui
ad2021a1b1 Merge "adb: fix adb usb operations on device." 2016-04-25 17:19:03 +00:00
Raja M
79bf64dc66 GCC compiler warning fix for sprintf into snprintf
To fix GCC WARNINGS while building.
or
To support error free -D_FORTIFY_SOURCE=2 strict mode compilation.
2016-04-24 09:44:04 +05:30
Treehugger Robot
245e4dbfd4 Merge "Fix NULL deref on exec-in with insufficient arguments" 2016-04-22 15:40:58 +00:00
Zach Riggle
ccafc79de7 Fix NULL deref on exec-in with insufficient arguments
(cherry-pick of 566a28169b84836fddd5ae96db9b147237ea054f.)

Bug: 28152091
Change-Id: Ib59e3bf7f26974aa09d2e6a0e1d9281d7ce25511
2016-04-22 08:08:01 -07:00
Treehugger Robot
d61bfb9a79 Merge "Connect to activity manager as root." 2016-04-20 22:47:50 +00:00
Christopher Ferris
8fb38ae82d Connect to activity manager as root.
Before dropping root privileges, connect to the activity manager.
Also, only connect to the activity manager if this is a crash.

Bug: 28210681
(cherry picked from commit 0fc89f34b9)

Change-Id: Id25b92e550d71ffe1b9eafe43976ef514a83714b
2016-04-20 14:38:44 -07:00
Colin Cross
0652728e2a Merge "Update sanitize property format" 2016-04-19 22:42:04 +00:00
Treehugger Robot
090003a8d1 Merge "Don't include android-base/macros.h from android-base/unique_fd.h" 2016-04-19 22:34:57 +00:00
Elliott Hughes
4f2155518a Merge "More secure and compiler warning fix for sprintf into snprintf" 2016-04-19 22:03:58 +00:00
Christopher Wiley
2a7b86337f Don't include android-base/macros.h from android-base/unique_fd.h
This prevents a ton of macro collisions when libfoo includes libbinder
includes unique_fd.h.

Bug: 27804373
Change-Id: Ide834afb1052b32e86fad3fcba10cff3dafeb899
2016-04-19 14:45:48 -07:00
Raja M
a2f37e4fd7 More secure and compiler warning fix for sprintf into snprintf
To fix GCC WARNINGS while building.
or
To support error free -D_FORTIFY_SOURCE=2 strict mode compilation.

Change-Id: I999bd83785456a77247e5e1d708e2bdde2eb057b
2016-04-20 02:20:50 +05:30
Yabin Cui
09c5fcf760 Merge "adb: use a custom thread to poll for usb devices on mac." 2016-04-19 20:22:13 +00:00
Yabin Cui
48d4c0c42a adb: use a custom thread to poll for usb devices on mac.
On mac, if the adb server kicks a transport on some error, mac usb driver
will not report a new usb device. So instead of relying on mac usb driver
to report new usb devices, this CL uses a loop to search for usb devices
not exist before. Note that this is also the behavior on windows and linux
host.
`adb reconnect` can be used to verity this CL.

Bug: 25935458
Change-Id: I890e0eb1fae173f2e7a0c962ededa294d821e015
2016-04-19 11:26:44 -07:00
Chih-hung Hsieh
603df0e875 Merge "Fix google-runtime-int warnings." 2016-04-19 16:14:10 +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
a960864355 Merge "Fix kick_transport test." 2016-04-19 02:29:29 +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
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
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
b1393e93ad Merge "Remove toolbox iftop." 2016-04-18 17:38:36 +00:00
Christopher Wiley
c2241b9c5d Merge "Export libbinder headers from libhealhd.default" 2016-04-18 17:04:49 +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