Commit graph

25625 commits

Author SHA1 Message Date
Mark Salyzyn
ae1612c54c Merge "liblog: fix errno issues with event tag map" am: dfd30c4a16 am: 930ff186ce
am: 71b38def04

Change-Id: I83de9e374a67946fde8191d63720b102690d468f
2016-09-28 18:21:01 +00:00
Mark Salyzyn
71b38def04 Merge "liblog: fix errno issues with event tag map" am: dfd30c4a16
am: 930ff186ce

Change-Id: Iac84f40e9e79063bee7f213eb21ff5f866462a32
2016-09-28 18:17:49 +00:00
Mark Salyzyn
930ff186ce Merge "liblog: fix errno issues with event tag map"
am: dfd30c4a16

Change-Id: Ic8db0058a3258d356f3732727a4628c013f76b4c
2016-09-28 18:14:48 +00:00
Treehugger Robot
dfd30c4a16 Merge "liblog: fix errno issues with event tag map" 2016-09-28 18:07:09 +00:00
David Pursell
5cab7cc637 Merge "adb: fix host-side serial number parsing for IPv6." am: b1c4d90215 am: 94c652ed31
am: dde69001c2

Change-Id: I869720698bb91b0e968c51740b916ab58ea89d5a
2016-09-28 17:46:46 +00:00
David Pursell
dde69001c2 Merge "adb: fix host-side serial number parsing for IPv6." am: b1c4d90215
am: 94c652ed31

Change-Id: I87e3bbc33077830ca95e06807cb9863f42b87bf4
2016-09-28 17:41:16 +00:00
David Pursell
94c652ed31 Merge "adb: fix host-side serial number parsing for IPv6."
am: b1c4d90215

Change-Id: I62454f520192df9b600280b59704e7c0fe55687f
2016-09-28 17:35:47 +00:00
Treehugger Robot
b1c4d90215 Merge "adb: fix host-side serial number parsing for IPv6." 2016-09-28 17:30:29 +00:00
Mark Salyzyn
4355c4e07a Merge "liblog: free event tag map in __android_log_close()" am: 1dfa8112ce am: 7d1c2ab2bc
am: 3c947ae165

Change-Id: I176468638240d13f17535aeff3274e1767494b46
2016-09-28 15:08:49 +00:00
Mark Salyzyn
3c947ae165 Merge "liblog: free event tag map in __android_log_close()" am: 1dfa8112ce
am: 7d1c2ab2bc

Change-Id: I916ec52fe782d52f0f3efc64f3349e589a8e4910
2016-09-28 15:05:35 +00:00
Mark Salyzyn
7d1c2ab2bc Merge "liblog: free event tag map in __android_log_close()"
am: 1dfa8112ce

Change-Id: I2b613be1642570b678dbb9d199b7287d6f9f6cc7
2016-09-28 15:02:36 +00:00
Treehugger Robot
1dfa8112ce Merge "liblog: free event tag map in __android_log_close()" 2016-09-28 14:58:39 +00:00
Dan Albert
34cce80473 Merge "Migrate liblog to ndk_library." am: b98317ff1c am: fda0868744
am: e93a7538af

Change-Id: I11d383b706fff6ea4c01b718a71e6a95cd4d3021
2016-09-27 20:52:40 +00:00
Josh Gao
a539d4c04c Merge "adb: fix IOKit handle leaks on OS X." am: a2aff3f809 am: 279a1ea5b0
am: dbb34a87b4

Change-Id: I18ab725e1895f58519cab7f2bd29065058d70700
2016-09-27 20:52:26 +00:00
Dan Albert
e93a7538af Merge "Migrate liblog to ndk_library." am: b98317ff1c
am: fda0868744

Change-Id: I8c6e62c13dd34b588e4a4b3090df6e92b0983d17
2016-09-27 20:46:07 +00:00
Josh Gao
dbb34a87b4 Merge "adb: fix IOKit handle leaks on OS X." am: a2aff3f809
am: 279a1ea5b0

Change-Id: Ia45f5ae1943a0d5292da230e902751e127702be4
2016-09-27 20:45:55 +00:00
Dan Albert
fda0868744 Merge "Migrate liblog to ndk_library."
am: b98317ff1c

Change-Id: I660f4470e730d43d0a9896d3665cd40134c636d0
2016-09-27 20:43:36 +00:00
Josh Gao
279a1ea5b0 Merge "adb: fix IOKit handle leaks on OS X."
am: a2aff3f809

Change-Id: I24587b122c3d4d57eef137456c3628e4010d7b5c
2016-09-27 20:43:24 +00:00
Treehugger Robot
b98317ff1c Merge "Migrate liblog to ndk_library." 2016-09-27 20:38:45 +00:00
Josh Gao
a2aff3f809 Merge "adb: fix IOKit handle leaks on OS X." 2016-09-27 20:38:37 +00:00
Josh Gao
b6a2f59515 adb: fix IOKit handle leaks on OS X.
Bug: https://code.google.com/p/android/issues/detail?id=219085
Test: Removed sleep in RunLoopThread, compared before/after this patch
Change-Id: Ia65bbedfb7d47bdb02bdfb69778784e5e855900b
2016-09-27 12:36:58 -07:00
Iliyan Malchev
c3f99fa4c9 Merge changes from topic 'b/31458381' am: 8d8545120c am: fe0d0be9a9
am: 7b63c63335

Change-Id: If50c189f59c491c9550e586206920146ad49f528
2016-09-27 00:18:36 +00:00
Iliyan Malchev
121fe849e8 init.rc: have hwservicemanager start the HAL class am: 57d66b8447 am: ad0cbcf21c
am: f0099ccb23

Change-Id: I5c24ecbf89d723c478a02bcab8cffc4e9e4385e9
2016-09-27 00:16:50 +00:00
Martijn Coenen
ac129cbaa2 Add hwbinder dev node permissions. am: f5110ea029 am: a2249bc1bd
am: 2008af6af5

Change-Id: I18c7c1b8b372f59f609e12a2532bd9e435e1ba81
2016-09-27 00:16:46 +00:00
Iliyan Malchev
7b63c63335 Merge changes from topic 'b/31458381' am: 8d8545120c
am: fe0d0be9a9

Change-Id: I1675fb9c742c394299b5a490c7c7305459dc5d0d
2016-09-27 00:14:15 +00:00
Iliyan Malchev
f0099ccb23 init.rc: have hwservicemanager start the HAL class am: 57d66b8447
am: ad0cbcf21c

Change-Id: I93a6154aacb1147dd0ba1f6cfb29c8e6d0dcfddf
2016-09-27 00:12:22 +00:00
Martijn Coenen
2008af6af5 Add hwbinder dev node permissions. am: f5110ea029
am: a2249bc1bd

Change-Id: I77503d0b9382a1921877b39acc6d5f8bacbbd897
2016-09-27 00:12:17 +00:00
Iliyan Malchev
fe0d0be9a9 Merge changes from topic 'b/31458381'
am: 8d8545120c

Change-Id: If4de2dff5c3b4a253529f52a2c2af118147b1961
2016-09-27 00:10:32 +00:00
Iliyan Malchev
ad0cbcf21c init.rc: have hwservicemanager start the HAL class
am: 57d66b8447

Change-Id: I8ee19e5f08c514bad1315d24546725203b41c13c
2016-09-27 00:08:22 +00:00
Martijn Coenen
a2249bc1bd Add hwbinder dev node permissions.
am: f5110ea029

Change-Id: I67ee1a3ca8a1e226f7487b33fda21943ca77b696
2016-09-27 00:08:19 +00:00
Treehugger Robot
8d8545120c Merge changes from topic 'b/31458381'
* changes:
  init.rc: have hwservicemanager start the HAL class
  Add hwbinder dev node permissions.
2016-09-26 23:54:54 +00:00
Elliott Hughes
9daaf229d0 Merge "Switch adb to <android-base/properties.h>." am: d9a23b5733 am: 5dc7e6a79a
am: 8b7751d360

Change-Id: Ie02bbd139d522d930649ecb06da3f853d6995034
2016-09-26 22:25:21 +00:00
Elliott Hughes
8b7751d360 Merge "Switch adb to <android-base/properties.h>." am: d9a23b5733
am: 5dc7e6a79a

Change-Id: Ie2718d9f843b11feca003805569bb35acde62463
2016-09-26 22:22:48 +00:00
Elliott Hughes
5dc7e6a79a Merge "Switch adb to <android-base/properties.h>."
am: d9a23b5733

Change-Id: I09a1832143d9f54cd67128602c9e518a1b398b5c
2016-09-26 22:19:04 +00:00
Treehugger Robot
d9a23b5733 Merge "Switch adb to <android-base/properties.h>." 2016-09-26 21:58:16 +00:00
Robb Glasser
df70b14c2c Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into nyc-mr1-dev am: bba43b374b
am: 2baa65a507

Change-Id: I0b748f49d733e37e6b1f58beac1dfb5ccf6acdd3
2016-09-26 21:26:23 +00:00
Thierry Strudel
55cec58703 [DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available am: 738e0dcf0a
am: 5f4db94228

Change-Id: I05fbf1cffb44595d354219b1753cd7c2b37e10db
2016-09-26 21:25:32 +00:00
Robb Glasser
2baa65a507 Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into nyc-mr1-dev
am: bba43b374b

Change-Id: I0a481621a85ff28894518b0c7357b19c1df6eec0
2016-09-26 21:23:57 +00:00
Thierry Strudel
5f4db94228 [DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available
am: 738e0dcf0a

Change-Id: I9de236b53b4f4f449de65bfb856771278b92fa9e
2016-09-26 21:23:02 +00:00
Mitchell Wills
3cca209b91 Merge "Add fastboot --skip-reboot flag" am: 60a99eb8f7 am: d62dcfa03f
am: d21bc6ac81

Change-Id: I7cef28ceecf147213eb332e3cce48f59f09474cd
2016-09-26 21:17:53 +00:00
Robb Glasser
bba43b374b Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into nyc-mr1-dev 2016-09-26 21:15:24 +00:00
Mitchell Wills
d21bc6ac81 Merge "Add fastboot --skip-reboot flag" am: 60a99eb8f7
am: d62dcfa03f

Change-Id: Ib51c3f98488c2c389efb1590ef650c5ebd0194b5
2016-09-26 21:15:23 +00:00
Mitchell Wills
d62dcfa03f Merge "Add fastboot --skip-reboot flag"
am: 60a99eb8f7

Change-Id: Id3ee7f6603437fae7ed26e8af93235f6531e0219
2016-09-26 21:13:23 +00:00
Treehugger Robot
60a99eb8f7 Merge "Add fastboot --skip-reboot flag" 2016-09-26 21:08:07 +00:00
Elliott Hughes
ffdec18017 Switch adb to <android-base/properties.h>.
Bug: http://b/23102347
Test: manual
Change-Id: Iffa66258c01f84f41b9af99ab5e768a0a2669106
2016-09-26 13:14:14 -07:00
Mitchell Wills
31dce302db Add fastboot --skip-reboot flag
Add a flag to fastboot that will cause it to not reboot the device after
performing commands like update and flashall.

Fixed: 31743001
Test: run fastboot update with and without --skip-reboot flag
Change-Id: I7f4056249a52779c7fc752c9d1009a58a44762df
2016-09-26 11:27:16 -07:00
Mark Salyzyn
70a83dc7b3 liblog: fix errno issues with event tag map
Cleanup.

Save the errno for the calls that fail, and reinstate them for
return. Drop fprintf stutter, one succinct line. Solve a memory
leak in close.  Change android_lookupEventTag() to use an
unsigned int so that we can use the full range of uint32_t tags.

Make sure this file compiles clean in C++.

Test: gTest liblog-unit-tests
Bug: 30963384
Bug: 31456426
Change-Id: I6a5efa6fb7e991431caba75ef0971e111968f6bf
2016-09-26 09:23:55 -07:00
Mark Salyzyn
ba1a798fd8 liblog: free event tag map in __android_log_close()
There is no leak since a reference always remained and could get
reused.  It just makes sense to also close the event tag map as well
if logging is closed.  If we close we also have to fix a tagArray
leak in android_closeEventTagMap().

NB: __android_log_close() already makes an assumption that another
thread is not logging at the same time, which is true in all callers
at this time.  There are some partial mitigation strategies if
__android_log_close() is called asynchronously, but not completely
solved at the cost of a lock for every logging call.

Test: gTest liblog-unit-tests
Bug: 30963384
Bug: 31456426
Change-Id: Ib76ad9302dba4d3f35250213f4dfef22498af238
2016-09-26 08:21:13 -07:00
Iliyan Malchev
57d66b8447 init.rc: have hwservicemanager start the HAL class
b/31458381
Test: passing build and runtime tests

Change-Id: I1d26af5ca1d0e9c7bbd97cfd88d0b432b50b7216
Signed-off-by: Iliyan Malchev <malchev@google.com>
2016-09-26 00:23:51 -07:00
Martijn Coenen
f5110ea029 Add hwbinder dev node permissions.
b/31458381
Test: pass

Change-Id: I8ec92a29287b17636c363c55a8565dacab19043d
Signed-off-by: Iliyan Malchev <malchev@google.com>
2016-09-26 00:23:51 -07:00