Commit graph

23527 commits

Author SHA1 Message Date
Josh Gao
36e606236a Merge \\"adb: refactor jdwp_service.cpp.\\" am: 71d11ade9d
am: a4e35be4a4

Change-Id: I7bbc7c8b3df8cd2aa37bd41dfb53fda8b841cbb9
2016-06-23 23:34:09 +00:00
Josh Gao
a4e35be4a4 Merge \"adb: refactor jdwp_service.cpp.\"
am: 71d11ade9d

Change-Id: If7940e3a0b3a457d9be29dfb6c0707dbe8961397
2016-06-23 23:31:38 +00:00
Treehugger Robot
71d11ade9d Merge "adb: refactor jdwp_service.cpp." 2016-06-23 23:28:25 +00:00
Josh Gao
c0c57c43b2 Merge \\"adb: add test for SIGHUP behavior.\\" am: a355dd6110
am: 05f889dd4e

Change-Id: I7ea1f3071fbf0f8a5dd83173c62566e08b3c2503
2016-06-23 23:14:39 +00:00
Josh Gao
05f889dd4e Merge \"adb: add test for SIGHUP behavior.\"
am: a355dd6110

Change-Id: Ib786fefd55a2a4533bf66dc1e47f88e398beb8e1
2016-06-23 23:12:05 +00:00
Treehugger Robot
a355dd6110 Merge "adb: add test for SIGHUP behavior." 2016-06-23 23:09:06 +00:00
Josh Gao
fe50bb713b adb: add test for SIGHUP behavior.
This keeps regressing, so add a test to keep this from happening.

Bug: http://b/23603716
Bug: http://b/25965770
Bug: http://b/29565233
Test: Ran test with/without commit cd5d737, fails before, passes after
Change-Id: I8c431e10fc76da5a9fd404dd70f17bb8a8df24e6
2016-06-23 15:01:50 -07:00
Josh Gao
3f8ad892ac Merge changes Ia59c6dbe,I13b17bcd am: 0b47d08303
am: 79a69f0bd7

Change-Id: I902d0f4f7ba04e5b72361b591794a481f9c4059e
2016-06-23 21:27:42 +00:00
Josh Gao
79a69f0bd7 Merge changes Ia59c6dbe,I13b17bcd
am: 0b47d08303

Change-Id: Ica4c5de30e12f6950f0a9f3a2dc94213ef2fe70a
2016-06-23 21:25:10 +00:00
Treehugger Robot
0b47d08303 Merge changes Ia59c6dbe,I13b17bcd
* changes:
  adb: fix fd leak when shell fails to create a thread.
  adb: don't dup local socket fd.
2016-06-23 21:22:54 +00:00
Josh Gao
e31a7a4ce4 adb: fix fd leak when shell fails to create a thread.
Bug: http://b/29565233
Change-Id: Ia59c6dbe5ac033425c11739579e85cbcad1170d1
2016-06-23 13:14:49 -07:00
Josh Gao
cd5d7376dc adb: don't dup local socket fd.
SIGHUP handling depends on the local socket fd being fully closed in
order to trigger an event on its counterpart. Release the local socket
fd inside of Subprocess when returning it to ensure this.

Functionally, a cherry-pick of internal commit 42afe20.

Bug: http://b/29565233
Change-Id: I13b17bcddf0b396a5f4880f9e410fbbf24d9370d
2016-06-22 19:09:42 -07:00
Josh Gao
40f40d68ab adb: don\'t dup local socket fd.
am: 42afe2033f  -s ours

Change-Id: Ie2544493ccb25b48cc0f13602c5078fecbd6b7ef
2016-06-23 01:32:18 +00:00
Josh Gao
42afe2033f adb: don't dup local socket fd.
SIGHUP handling depends on the local socket fd being fully closed in
order to trigger an event on its counterpart. Release the local socket
fd inside of Subprocess when returning it to ensure this.

Bug: http://b/29565233
Change-Id: I13b17bcddf0b396a5f4880f9e410fbbf24d9370d
2016-06-22 15:57:12 -07:00
Chih-Hung Hsieh
4a8ab16746 Merge \\"Fix misc-macro-parentheses warnings in system/core.\\" am: 495541c5bb
am: 65828a0ec9

Change-Id: I7431484a0245468fba58ed587d3235125f35cf8e
2016-06-22 22:45:28 +00:00
Chih-Hung Hsieh
65828a0ec9 Merge \"Fix misc-macro-parentheses warnings in system/core.\"
am: 495541c5bb

Change-Id: I021b653779c5119398c31ee354372366ba029328
2016-06-22 22:39:07 +00:00
Treehugger Robot
495541c5bb Merge "Fix misc-macro-parentheses warnings in system/core." 2016-06-22 22:35:02 +00:00
Elliott Hughes
e7130d28c7 Merge \\"Lose log to toybox.\\" am: cfdd57eed8
am: a247e9ad47

Change-Id: Iec95d39df39df705f0d6b5bb90e268330cabf031
2016-06-22 21:43:35 +00:00
Elliott Hughes
a247e9ad47 Merge \"Lose log to toybox.\"
am: cfdd57eed8

Change-Id: I553d1445cc98eedc07ec091e1a3ac7196f786446
2016-06-22 21:41:03 +00:00
Treehugger Robot
cfdd57eed8 Merge "Lose log to toybox." 2016-06-22 21:35:50 +00:00
Chih-Hung Hsieh
cdb2ca5d9f Fix misc-macro-parentheses warnings in system/core.
Add parentheses around macro arguments used beside operators.
Bug: 28705665

Change-Id: I9226f319e283be640eddc31687f75b51a8ef0ac6
2016-06-22 14:33:13 -07:00
Christopher Ferris
6527fa00f7 Merge \\"Add support to indicate bitness of public library.\\" am: 3fb358478f
am: 1b4f54e878

Change-Id: I300bb0bad0f22e0b535e04e3da5bac3872769597
2016-06-22 19:40:11 +00:00
Christopher Ferris
1b4f54e878 Merge \"Add support to indicate bitness of public library.\"
am: 3fb358478f

Change-Id: Ia5a7580cb26dbafa5863ae5d85aaaccb62936921
2016-06-22 19:37:31 +00:00
Elliott Hughes
cf75c1bf14 Lose log to toybox.
Change-Id: I42d792e79ed51fcc3c89f77d039d39417ead03c3
2016-06-22 12:33:33 -07:00
Treehugger Robot
3fb358478f Merge "Add support to indicate bitness of public library." 2016-06-22 19:26:51 +00:00
Josh Gao
31fc3c3be6 DO NOT MERGE: adb: use asocket\\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 am: 46104a0d79 -s ours
am: 2dff6490fd

Change-Id: Ia46affe450d4189f1ac77ed8024452394f065468
2016-06-22 18:36:31 +00:00
Josh Gao
2dff6490fd DO NOT MERGE: adb: use asocket\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16
am: 46104a0d79  -s ours

Change-Id: If33739a6317a8ad6f008960a5726dc6e2ce7c18c
2016-06-22 18:33:53 +00:00
Josh Gao
46104a0d79 DO NOT MERGE: adb: use asocket\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376
am: 755ab3ed16

Change-Id: I43718396c291ac9cb261097f7a34cfa7c1fa3725
2016-06-22 18:31:11 +00:00
Josh Gao
3d93063c14 DO NOT MERGE: adb: use asocket\\\\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e am: d99c745c31 am: 57b4b422e3 am: 96dea5690a -s ours
am: 2a9f4e1c50

Change-Id: Ifa8c4e19405a574e99704cab576ac9db5921202d
2016-06-22 18:28:43 +00:00
Josh Gao
755ab3ed16 DO NOT MERGE: adb: use asocket\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186
am: 57f5c95376

Change-Id: Ib68980c2897ba668691c76989375a5382bc8af3f
2016-06-22 18:26:13 +00:00
Josh Gao
2a9f4e1c50 DO NOT MERGE: adb: use asocket\\\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e am: d99c745c31 am: 57b4b422e3
am: 96dea5690a  -s ours

Change-Id: Icef5dce2b992030b3cee1269e2e46992bd063537
2016-06-22 18:23:51 +00:00
Josh Gao
57f5c95376 DO NOT MERGE: adb: use asocket\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours
am: d389f5d186

Change-Id: I5c106da4673571bc24e17742ab62960333507f77
2016-06-22 18:23:41 +00:00
Josh Gao
d389f5d186 DO NOT MERGE: adb: use asocket\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219
am: fdf3112207  -s ours

Change-Id: I42711a1a41b8099df1b769eb1c4e1fbbd2ee78bf
2016-06-22 18:21:33 +00:00
Christopher Ferris
39da84b06c Add support to indicate bitness of public library.
For public vendor libraries, a vendor might have only a 32 bit
or only a 64 bit version of the library. Add a way to indicate this
in the public.libraries.txt files. The new format is:

  library.so 32

This indicates that this is a 32 bit only public library.

  library.so 64

This indicates that this is a 64 bit only public library.

Bug: 29370721
Bug: 29512261
(cherry picked from commit 6664a805ca)

Change-Id: Id52c8b61d5c802ce62edda7e25f2755f6f93d6b7
2016-06-22 11:21:21 -07:00
Josh Gao
96dea5690a DO NOT MERGE: adb: use asocket\\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e am: d99c745c31
am: 57b4b422e3

Change-Id: I14d98d1df800f6197c5eb28a45bd9fe259c844bf
2016-06-22 18:21:11 +00:00
Josh Gao
fdf3112207 DO NOT MERGE: adb: use asocket\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411
am: dc6e14f219

Change-Id: Iac5c5b2bb07505cde1638f42d5e1ae6566a88c0b
2016-06-22 18:19:09 +00:00
Josh Gao
57b4b422e3 DO NOT MERGE: adb: use asocket\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e
am: d99c745c31

Change-Id: I1b615a3910580ae7f78b038b18b969c196fabe1e
2016-06-22 18:18:37 +00:00
Josh Gao
dc6e14f219 DO NOT MERGE: adb: use asocket\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours
am: fb9747c411

Change-Id: Ife4804a27b044aebaaefda6626adb61c241812af
2016-06-22 18:16:21 +00:00
Josh Gao
d99c745c31 DO NOT MERGE: adb: use asocket\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours
am: f5592e174e

Change-Id: Ib220d4a778ea4e7bda44aafbbaa4911c243d7db7
2016-06-22 18:15:59 +00:00
Josh Gao
fb9747c411 DO NOT MERGE: adb: use asocket\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours
am: 45a4bca09d  -s ours

Change-Id: I2124ed25893de9910be435ba68619dfc00e66239
2016-06-22 18:11:44 +00:00
Josh Gao
f5592e174e DO NOT MERGE: adb: use asocket\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534
am: 8ec6f5b46f  -s ours

Change-Id: If7256035b8844a6567080b5caf769a0a4f567d2f
2016-06-22 18:11:17 +00:00
Josh Gao
45a4bca09d DO NOT MERGE: adb: use asocket\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999
am: a3d96cfec9  -s ours

Change-Id: I4ca0f2890519c3450a15edab989ca424b6bb10ae
2016-06-22 18:07:24 +00:00
Josh Gao
8ec6f5b46f DO NOT MERGE: adb: use asocket\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f
am: 05d5db2534

Change-Id: I433e885416a6cbf93bc701cfebc046f78a7af7dd
2016-06-22 18:07:06 +00:00
Josh Gao
a3d96cfec9 DO NOT MERGE: adb: use asocket\\'s close function when closing. am: 5218ad36ad
am: d7e24ec999

Change-Id: I9ca9e7e857de9e9679169cd7239f9e54a3d98dd2
2016-06-22 18:02:25 +00:00
Josh Gao
05d5db2534 DO NOT MERGE: adb: use asocket\\'s close function when closing. am: 83cb3032d2 -s ours
am: 420aa30c9f

Change-Id: I779b0b79ce268561f4a686d6e98c131707464ecf
2016-06-22 18:01:40 +00:00
Josh Gao
d7e24ec999 DO NOT MERGE: adb: use asocket\'s close function when closing.
am: 5218ad36ad

Change-Id: Ibc9ee3b566d34847f4e1e02413890449750ba2f5
2016-06-22 17:59:18 +00:00
Josh Gao
420aa30c9f DO NOT MERGE: adb: use asocket\'s close function when closing.
am: 83cb3032d2  -s ours

Change-Id: I357c754fe2bc3fdf4f050c26aace2bea4c6569c2
2016-06-22 17:58:51 +00:00
Elliott Hughes
e8d4b42ffa Merge \\"Address old review comments in adb_auth_host.cpp.\\" am: 57bbedc036
am: a81117b8f9

Change-Id: I3c06cce473ef441c632ae1d3b6c2fbb7cd0679ae
2016-06-22 17:21:16 +00:00
Elliott Hughes
a81117b8f9 Merge \"Address old review comments in adb_auth_host.cpp.\"
am: 57bbedc036

Change-Id: I0ab20c9258d42e6b0b847e8eb69382005f086706
2016-06-22 17:17:51 +00:00
Treehugger Robot
57bbedc036 Merge "Address old review comments in adb_auth_host.cpp." 2016-06-22 17:09:26 +00:00