Commit graph

34474 commits

Author SHA1 Message Date
Alex Naidis
fb5f04285b Merge "libcutils: Clarify schedboost_enabled()" am: 643b4776b5 am: 7ce1bdec47
am: 234fae2823

Change-Id: I9c65ccaf5f52db783b0611ca9c183cc64e8a9ad5
2017-06-20 18:36:40 +00:00
Alex Naidis
234fae2823 Merge "libcutils: Clarify schedboost_enabled()" am: 643b4776b5
am: 7ce1bdec47

Change-Id: Ia1b594ccd71a20d787cb70b2b8750c30158b7ffe
2017-06-20 18:22:26 +00:00
Alex Naidis
7ce1bdec47 Merge "libcutils: Clarify schedboost_enabled()"
am: 643b4776b5

Change-Id: Iea24290c320a99eae7a8c9174e60a0441b0378d8
2017-06-20 18:19:19 +00:00
Treehugger Robot
643b4776b5 Merge "libcutils: Clarify schedboost_enabled()" 2017-06-20 18:10:15 +00:00
Narayan Kamath
5a6b3e05a9 Merge "zip_archive_test: compare error codes directly." am: d1e9e7bc06 am: 9be5dbed91
am: ecc0b6c605

Change-Id: Ic9bcd8f06849eafafd5adefab86667b21d92586f
2017-06-20 11:00:50 +00:00
Narayan Kamath
ecc0b6c605 Merge "zip_archive_test: compare error codes directly." am: d1e9e7bc06
am: 9be5dbed91

Change-Id: I42d449eba683e2f2b158992573cacbbde2b28e27
2017-06-20 10:58:30 +00:00
Narayan Kamath
9be5dbed91 Merge "zip_archive_test: compare error codes directly."
am: d1e9e7bc06

Change-Id: Ibff1f3b34993391cd62c9c9f1d90adb62b4e70a8
2017-06-20 10:55:19 +00:00
Narayan Kamath
d1e9e7bc06 Merge "zip_archive_test: compare error codes directly." 2017-06-20 10:50:27 +00:00
Tom Cherry
8a68f69f5c Merge "Move restorecon() of /sys from init to ueventd." am: 2787894768 am: 432326ecbb -s ours
am: fcea7cae06  -s ours

Change-Id: I2b4b8ebf68c68384d8f2c56bcae74bb25a842a70
2017-06-20 05:03:39 +00:00
Tom Cherry
fcea7cae06 Merge "Move restorecon() of /sys from init to ueventd." am: 2787894768
am: 432326ecbb  -s ours

Change-Id: Id6e749dfe32eb6d8784e6c634211e3e0750d2904
2017-06-20 04:56:30 +00:00
Tom Cherry
432326ecbb Merge "Move restorecon() of /sys from init to ueventd."
am: 2787894768

Change-Id: I45baa3ee95a630517ef94e1bca3d74637655abd9
2017-06-20 01:20:10 +00:00
Tom Cherry
2787894768 Merge "Move restorecon() of /sys from init to ueventd." 2017-06-20 01:13:37 +00:00
Tom Cherry
d2fd54e0ff Move restorecon() of /sys from init to ueventd.
ueventd already does restorecon() for /sys/{block,class,devices}, so
instead of duplicating this effort with init, move the restorecon()
that init does for all of /sys to ueventd.

Bug: 62420036
Change-Id: I6125f8ff5316a0cf45872d1100d089d71802958f
Merged-In: I6125f8ff5316a0cf45872d1100d089d71802958f
Test: Boot sailfish, bullhead
2017-06-20 00:02:05 +00:00
Erik Staats
203100046e Merge "Add building and installing of grep for vendor." into oc-dr1-dev
am: 56876ad518

Change-Id: I64f856e7c1252176d8bff33ef68f3b9260448b40
2017-06-19 22:42:54 +00:00
Erik Staats
56876ad518 Merge "Add building and installing of grep for vendor." into oc-dr1-dev 2017-06-19 22:27:10 +00:00
Christopher Ferris
4c4b3a28a0 Merge "Add EH frame and debug frame support." am: 27fea2c295 am: b1dc155338
am: 9c3c75ef2f

Change-Id: I1bcd4746208fb36b9e18d58dc0b584362d030c1a
2017-06-19 22:01:34 +00:00
Christopher Ferris
9c3c75ef2f Merge "Add EH frame and debug frame support." am: 27fea2c295
am: b1dc155338

Change-Id: I050d1046fd7605dc23d18219b3f7439d362225b2
2017-06-19 21:54:35 +00:00
Christopher Ferris
b1dc155338 Merge "Add EH frame and debug frame support."
am: 27fea2c295

Change-Id: Id28a8f7c2fc235ec51f941c9db6260f74d5bd1ed
2017-06-19 21:48:04 +00:00
Christopher Ferris
27fea2c295 Merge "Add EH frame and debug frame support." 2017-06-19 21:37:26 +00:00
Josh Gao
fbfcdd062e Merge "adb: fix deadlock between transport_unref and usb_close." into oc-dr1-dev
am: 38eb25e157  -s ours

Change-Id: I029ddf455138b68118aa5eeb4178031c81f0a35f
2017-06-19 21:09:41 +00:00
TreeHugger Robot
38eb25e157 Merge "adb: fix deadlock between transport_unref and usb_close." into oc-dr1-dev 2017-06-19 20:58:22 +00:00
Tom Cherry
23d59e8728 Merge "init: move killing of process groups to libprocessgroup" into oc-dr1-dev
am: 9cf4000f92

Change-Id: Iaa45b1bc504f42a1a01ef28f4ec768f81d6c981d
2017-06-19 20:50:23 +00:00
Tom Cherry
9cf4000f92 Merge "init: move killing of process groups to libprocessgroup" into oc-dr1-dev 2017-06-19 20:38:37 +00:00
Erik Staats
76d8d36ed8 Add building and installing of grep for vendor.
Merged from
0c3b1bd2a5 .

Bug: 38240024
Test: Verified that grep is installed in /vendor/bin.  See details in testing
done comment in https://googleplex-android-review.git.corp.google.com/2428550 .
Change-Id: I15e1f9994af90fc7edccf35adbbcef349aca6929
2017-06-19 13:12:37 -07:00
Tom Cherry
a2e2281896 Merge "Move restorecon() of /sys from init to ueventd." into oc-dev-plus-aosp
am: a3598113ad

Change-Id: I3ec4d5957fddcf04e4a82bc00fc418b2327354e5
2017-06-19 19:44:20 +00:00
TreeHugger Robot
a3598113ad Merge "Move restorecon() of /sys from init to ueventd." into oc-dev-plus-aosp 2017-06-19 19:36:56 +00:00
Josh Gao
d1f7fef69b adb: fix deadlock between transport_unref and usb_close.
Fix a deadlock that happened when a reader/writer thread released a
transport while the hotplug thread attempted  to handle a device
disconnection. Decrementing a transport refcount to zero would hold the
global transport mutex and attempt to take the usb handles mutex, while
the hotplug thread would hold the usb handles mutex and try to call
unregister_usb_transport, which would attempt to take the global
transport mutex.

Resolve this by making transport_unref not take the global transport
mutex.

Bug: http://b/62423753
Test: python test_device.py
Merged-In: Ib48b80a2091a254527f3a7d945b6a11fae61f937
Change-Id: Ib48b80a2091a254527f3a7d945b6a11fae61f937
(cherry picked from commit 7e197ef833)
2017-06-19 11:17:44 -07:00
Tom Marshall
2d9293954c Merge "init: Run restorecon_recursive asynchronously" am: ad4aa9e169 am: 0329b8d03e
am: ebd6a64694

Change-Id: Id6ff385d4421af87834abe431c11bddd98583fe1
2017-06-19 18:11:43 +00:00
Tom Marshall
ebd6a64694 Merge "init: Run restorecon_recursive asynchronously" am: ad4aa9e169
am: 0329b8d03e

Change-Id: I1cd56fc9521451742b04d7f56bc0b657a0672314
2017-06-19 18:06:14 +00:00
Tom Marshall
0329b8d03e Merge "init: Run restorecon_recursive asynchronously"
am: ad4aa9e169

Change-Id: I809f5d08fda61b25bbed2b01dac9ee7e4ab9bfc9
2017-06-19 18:00:17 +00:00
Tom Cherry
c3e955123c Move restorecon() of /sys from init to ueventd.
ueventd already does restorecon() for /sys/{block,class,devices}, so
instead of duplicating this effort with init, move the restorecon()
that init does for all of /sys to ueventd.

Bug: 62420036
Change-Id: I6125f8ff5316a0cf45872d1100d089d71802958f
Test: Boot sailfish, bullhead
2017-06-19 10:59:06 -07:00
Treehugger Robot
ad4aa9e169 Merge "init: Run restorecon_recursive asynchronously" 2017-06-19 17:52:02 +00:00
Neil Fuller
0e9bc370e2 Merge "Move system/core/tzdatacheck to system/timezone" am: acb6473793 am: e07e6fbf72
am: 2bb1e712a8

Change-Id: I9f45dd8c0c396abea0b6dfa5be6b829d2896756d
2017-06-19 14:13:55 +00:00
Neil Fuller
2bb1e712a8 Merge "Move system/core/tzdatacheck to system/timezone" am: acb6473793
am: e07e6fbf72

Change-Id: Ifc45d80e5c8cbfbd2f3eefcedd6c9236d0c843b6
2017-06-19 14:08:25 +00:00
Neil Fuller
e07e6fbf72 Merge "Move system/core/tzdatacheck to system/timezone"
am: acb6473793

Change-Id: I14a77c9b6ac40b309194587f33c2f00497edb850
2017-06-19 14:02:53 +00:00
Neil Fuller
acb6473793 Merge "Move system/core/tzdatacheck to system/timezone" 2017-06-19 13:54:38 +00:00
Narayan Kamath
1ef9d2dfbe zip_archive_test: compare error codes directly.
Make them available to tests so that they can compare values
directly instead of comparing error code strings.

Test: zip_archive_test
Change-Id: I1c78c24651ff7549b5125a49a4e67bbd8295c617
2017-06-19 13:03:41 +01:00
Jiyong Park
7132984926 Merge "Mark libdemangle as vendor_available" am: dd622c5c34 am: 14f088cb67
am: 5b2433611b

Change-Id: If8606038f46f34d75d469775fcd0b4db884b36a0
2017-06-19 03:41:40 +00:00
Jiyong Park
5b2433611b Merge "Mark libdemangle as vendor_available" am: dd622c5c34
am: 14f088cb67

Change-Id: I4a47d1a532394e32abdad234d696ac8c375eef90
2017-06-19 03:36:39 +00:00
Jiyong Park
14f088cb67 Merge "Mark libdemangle as vendor_available"
am: dd622c5c34

Change-Id: I460a3dc299d3311fa7582b41e839c487aac91eca
2017-06-19 03:31:08 +00:00
Treehugger Robot
dd622c5c34 Merge "Mark libdemangle as vendor_available" 2017-06-19 03:24:09 +00:00
Jaesung Chung
0cf45bcfd8 Merge "debuggerd_test: find backtrace frame in all lines in CrasherTest" am: fae8ec2556 am: 82e543afad
am: 205d51d333

Change-Id: Ic8ce192f7abe07f3cc58bf86476e58978b109435
2017-06-19 00:28:55 +00:00
Jaesung Chung
43dd866e08 Merge "logd-unit-tests: make sure use unsigned types when reading le" am: 31f2c81755 am: b9a1ff14ae
am: fe361ae7b3

Change-Id: I3b798c547772bf28f0ba00dfbf0a02b0712f9179
2017-06-19 00:28:29 +00:00
Jaesung Chung
205d51d333 Merge "debuggerd_test: find backtrace frame in all lines in CrasherTest" am: fae8ec2556
am: 82e543afad

Change-Id: Ib0a0ec0c94d8fff34d1390d44623697a51a0e317
2017-06-19 00:23:42 +00:00
Jaesung Chung
fe361ae7b3 Merge "logd-unit-tests: make sure use unsigned types when reading le" am: 31f2c81755
am: b9a1ff14ae

Change-Id: I2a780305fca0143ec863d1736d6ff74ff222eef2
2017-06-19 00:23:19 +00:00
Jaesung Chung
82e543afad Merge "debuggerd_test: find backtrace frame in all lines in CrasherTest"
am: fae8ec2556

Change-Id: I3f1e8d8b9131fe15b2de397b46f07bdc91f2b739
2017-06-19 00:18:49 +00:00
Jaesung Chung
b9a1ff14ae Merge "logd-unit-tests: make sure use unsigned types when reading le"
am: 31f2c81755

Change-Id: If4ad61346df17727e39bf0aa26c4dc96f8feeb24
2017-06-19 00:18:23 +00:00
Jaesung Chung
fae8ec2556 Merge "debuggerd_test: find backtrace frame in all lines in CrasherTest" 2017-06-19 00:11:51 +00:00
Jaesung Chung
31f2c81755 Merge "logd-unit-tests: make sure use unsigned types when reading le" 2017-06-19 00:10:52 +00:00
Josh Gao
24e8e0d0d8 Merge "adb: increase the shell command length limit." am: 9d2e688b9a am: 749d2a0ab5
am: 3df484eeab

Change-Id: I90d845f1c2b6aa767a7c5540b25619724f3b2331
2017-06-17 22:10:31 +00:00