Commit Graph

36959 Commits

Author SHA1 Message Date
Bowgo Tsai 73d9596bcd Merge "Removing $(PRODUCT_OUT)/root/root" am: 8cbbacdc15
am: d29ac08509

Change-Id: Id187c62961faefbccd9d14c9adcf4d4476d6d66e
2017-09-29 09:37:19 +00:00
Dan Willemsen 29108720ce Merge "Rename libz-host -> libz" am: 612b47630f am: b961c07f50
am: 3256982e9b

Change-Id: Id91307a501ceb84204c0fe63db4bade68124015a
2017-09-29 09:35:30 +00:00
Bowgo Tsai b08be62fca Merge "fs_mgr_fstab: removing fs_mgr_get_entry_for_mount_point_after()"
am: 16e31801a5

Change-Id: I59b8971b02f59f16082bc48ef96203ef13788277
2017-09-29 08:38:15 +00:00
Treehugger Robot 16e31801a5 Merge "fs_mgr_fstab: removing fs_mgr_get_entry_for_mount_point_after()" 2017-09-29 06:47:27 +00:00
Dan Willemsen 3256982e9b Merge "Rename libz-host -> libz" am: 612b47630f
am: b961c07f50

Change-Id: I8754646f115e124c726ece12bedd7d22287616dd
2017-09-29 04:20:39 +00:00
Bowgo Tsai d29ac08509 Merge "Removing $(PRODUCT_OUT)/root/root"
am: 8cbbacdc15

Change-Id: Ia671976f8d7d4b83478c58d566e309f36af125ab
2017-09-29 03:27:38 +00:00
Treehugger Robot 8cbbacdc15 Merge "Removing $(PRODUCT_OUT)/root/root" 2017-09-29 02:33:44 +00:00
Josh Gao bcadc77550 adbd: improve thread names.
Name each service thread specifically to improve debuggability.

Bug: http://b/65648324
Test: adb shell debuggerd -b `adb shell pidof adbd` during a sync
Change-Id: I644e25fc2f14a26eafd19f596e4e8f3c2bb79967
2017-09-28 16:45:24 -07:00
Dan Willemsen b961c07f50 Merge "Rename libz-host -> libz"
am: 612b47630f

Change-Id: If89115814856b306b7d00be89653305a1482e810
2017-09-28 22:57:38 +00:00
Dan Willemsen 612b47630f Merge "Rename libz-host -> libz" 2017-09-28 20:57:43 +00:00
Jiyong Park 326b783ad9 Tests are run with proper namespace configs by their locations
Tests in /data/[nativetest|benchmarktest] run with namespace config for
system and tests in /data/[nativetest|benchmarktest]/vendor run with
namespace config for vendor.

They no longer run in the 'test' namespace config which didn't impose
any restriction for libraries.

Bug: 67028906
Test: sailfish/marlin builds and boots
Test: no VTS regression on system.img from GSI + vendor.img from
marlin/sailfish
Test: VtsKernelLibcutilsTest successful in above config

Change-Id: I28cdef960d087565c8a22dca0e9a154fb1c3bb94
2017-09-29 05:04:27 +09:00
Josh Gao be399346db Merge changes I12d46493,I0ed00441,I55e5dc5a,If61296ff into oc-mr1-dev
am: c03127ef5c

Change-Id: I513e8af7c137166a7cd2094f464605bba2618dba
2017-09-28 18:00:39 +00:00
Josh Gao c03127ef5c Merge changes I12d46493,I0ed00441,I55e5dc5a,If61296ff into oc-mr1-dev
* changes:
  adb: add lock to remove_socket.
  Revert "adb: fix deadlock between transport_unref and usb_close."
  adb: allow selection of a specific transport.
  adb: fix deadlock in kick_all_transports.
2017-09-28 17:51:44 +00:00
Bowgo Tsai 144893e5ec Removing $(PRODUCT_OUT)/root/root
Bug: 65570851
Test: boot sailfish
Change-Id: I80c3c3de23c57343187fde207980731b5341bc1f
Merged-In: I80c3c3de23c57343187fde207980731b5341bc1f
(cherry picked from commit ededee3e40)
2017-09-28 18:10:58 +08:00
Bowgo Tsai c55f188207 fs_mgr_fstab: removing fs_mgr_get_entry_for_mount_point_after()
No fs_mgr client is using fs_mgr_get_entry_for_mount_point_after(), which
supports matching a mount point iteratively by specifying a starting entry
in the fstab. So removes it.

Also switch the public API from C/C++ to C++-only:
    fs_mgr_get_entry_for_mount_point(struct fstab* fstab, const char* path);
==> fs_mgr_get_entry_for_mount_point(struct fstab* fstab, const std::string& path);

Bug: 67024518
Test: boot sailfish, manually test fs_mgr_get_entry_for_mount_point().

Change-Id: I38e18fa6bd9485b6cd31b55474406a511df3f506
2017-09-28 15:28:59 +08:00
Dan Willemsen 5cfa006059 Rename libz-host -> libz
Test: m host
Change-Id: Ib276431d13b3e1bd243f84a80f69aafc12e71aac
2017-09-27 16:24:45 -07:00
Josh Gao 2b933918fc adb: add lock to remove_socket.
The comment that was previously here says that local_socket_list_lock
must be taken, but this function is exposed to external callers that
can't possibly take the lock.

Bug: http://b/65419665
Bug: 64709603 (presubmit balking at the line above)
Test: python test_device.py
Change-Id: I12d464933936b2a210a827ccf19ea201020d8d78
(cherry picked from commit 62c92f0c05)
2017-09-27 14:36:12 -07:00
Josh Gao c78ecca70b Revert "adb: fix deadlock between transport_unref and usb_close."
This reverts commit 7e197ef833.

The mutex lock in transport_unref hides a race that seems otherwise
hard to fix. Specifically, there's no synchronization between acquiring
a transport and attaching it to an asocket*, leading to badness if the
transport is closed in between the two operations.

Fix the original problem the reverted patch addressed by manually
unlocking before calling unregister_usb_transport.

Bug: http://b/65419665
Bug: 64709603 (presubmit balking at the line above)
Test: python test_device.py
Change-Id: I0ed0044129b1671b2c5dd1b9fa2e70a9b4475dc5
(cherry picked from commit e48ecce671)
2017-09-27 14:36:08 -07:00
Josh Gao 1bd8498fc8 adb: allow selection of a specific transport.
Extend device selection to allow selecting a specific transport via
monotonically increasing identifier (visible in devices -l).

This is useful when using multiple devices (like hikey960...) that
have identical bogus serial numbers like 0123456789ABCDEF.

Bug: http://b/37043226
Bug: 65419665
Test: adb -t {1, 2, 9999999} {get-serialno, shell, features}
Change-Id: I55e5dc5a406a4eeee0012e39b52e8cd232e608a6
(cherry picked from commit b122b17555)
2017-09-27 14:36:02 -07:00
Josh Gao 39103b95c8 adb: fix deadlock in kick_all_transports.
Previously, kick_all_transports would deadlock if there were any
inaccessible transports, because the transport kick function would call
unregister_usb_transport, which attempts to take the already-held
transport lock.

Fix this by switching the transport lock over to a recursive mutex.

Bug: 65419665
Test: manual
Change-Id: If61296ff4745e1699f3e216811c1383582627604
(cherry picked from commit 1db71afe97)
2017-09-27 14:35:52 -07:00
Tom Cherry 73a01e2ea4 Merge "init: remove non-protobuf single persistent property file" am: 61578ab50b am: aceda86059
am: 27c56990ce

Change-Id: I6284b97f0a23cd60d7d032e2285ad89c85de34cd
2017-09-27 20:44:29 +00:00
Tom Cherry 27c56990ce Merge "init: remove non-protobuf single persistent property file" am: 61578ab50b
am: aceda86059

Change-Id: Ie413aa25233db86ad236ece01f961103d133cb60
2017-09-27 20:41:13 +00:00
Tom Cherry aceda86059 Merge "init: remove non-protobuf single persistent property file"
am: 61578ab50b

Change-Id: Id4b622ebde1db431d5dcb8cc3edccc6843d4c72b
2017-09-27 20:38:29 +00:00
Tom Cherry 61578ab50b Merge "init: remove non-protobuf single persistent property file" 2017-09-27 20:35:09 +00:00
Mark Salyzyn 25964c7fd8 Merge "init: report shutdown,container for sigterm of init" am: d2b5a2417f am: 387dbf9ab0
am: a81e227284

Change-Id: Ie1a696d1b747cf90cb7f300bb2af454c10659ba5
2017-09-27 19:48:05 +00:00
Mark Salyzyn a81e227284 Merge "init: report shutdown,container for sigterm of init" am: d2b5a2417f
am: 387dbf9ab0

Change-Id: I3978179b92f096e3a951463dbe850a94a77ba27a
2017-09-27 19:45:01 +00:00
Mark Salyzyn 387dbf9ab0 Merge "init: report shutdown,container for sigterm of init"
am: d2b5a2417f

Change-Id: Ifb4ab5fa166ee055838c5ad52d69e0d0c07c7e59
2017-09-27 19:40:16 +00:00
Mark Salyzyn d2b5a2417f Merge "init: report shutdown,container for sigterm of init" 2017-09-27 19:32:31 +00:00
Josh Gao 294a3e42f4 Merge "adb: partially revert b5e11415." am: ef9426d883 am: d3f7956f2f
am: e8526de60b

Change-Id: I079da0c338d18191182ad93d31c93d00ec11db64
2017-09-27 18:51:19 +00:00
Josh Gao e8526de60b Merge "adb: partially revert b5e11415." am: ef9426d883
am: d3f7956f2f

Change-Id: I981f3acc2a2e27bbf34d838d60071bc8f66d4250
2017-09-27 18:49:26 +00:00
Josh Gao d3f7956f2f Merge "adb: partially revert b5e11415."
am: ef9426d883

Change-Id: I3f7fa1577bc79b5bdcacbeacc7b5141cc9c73cb9
2017-09-27 18:45:18 +00:00
Treehugger Robot ef9426d883 Merge "adb: partially revert b5e11415." 2017-09-27 18:38:28 +00:00
Tom Cherry 9614e4d4d9 init: remove non-protobuf single persistent property file
This has moved to being serialized with libprotobuf.

Test: persistent properties work on bullhead
Test: init unit tests
Change-Id: I26ebe135e37d352f9c53612301bde703144853e7
2017-09-27 18:22:35 +00:00
Tom Cherry 242a6654b4 Merge "init: cleanup exit() uses" am: 9c568d0fc0 am: 531cd0f6d3
am: c0fcd21c05

Change-Id: I6b40c532f2a0d2289f701abd4e4d46339a5ecbc1
2017-09-27 17:18:36 +00:00
Tom Cherry c0fcd21c05 Merge "init: cleanup exit() uses" am: 9c568d0fc0
am: 531cd0f6d3

Change-Id: Idf2f49362e0e969e5e31f698ad963bf7be7a8d8d
2017-09-27 17:16:39 +00:00
Tom Cherry 531cd0f6d3 Merge "init: cleanup exit() uses"
am: 9c568d0fc0

Change-Id: I52ee55a8717f60bbf47b0cbb2a3115c63a824f84
2017-09-27 17:14:17 +00:00
Tom Cherry 9c568d0fc0 Merge "init: cleanup exit() uses" 2017-09-27 17:10:31 +00:00
Mark Salyzyn 161b8626bd init: report shutdown,container for sigterm of init
Change HandleSigtermSignal() handler to report shutdown,container. Add
the new reason to bootstat.  Remove log stutter as
HandlPowerctlMessage will also do a LOG(INFO) reporting
shutdown,container as reason.

Sending SIGTERM to init is to allow a host OS to ask an Android
Container instance to shutdown.  The temptation is to report
shutdown,sigterm but that does not accurately describe the usage
scenario.

Test: compile
Bug: 63736262
Change-Id: I3c5798921bdbef5d2689ad22a2e8103741b570b4
2017-09-27 09:10:00 -07:00
Mark Salyzyn 7b034eb0a1 Merge changes I6620c996,I094c2cb0 into oc-mr1-dev
am: 27e56723de  -s ours

Change-Id: I9f18136d725664b8b732e0f4eb5d83822fda350c
2017-09-27 15:08:50 +00:00
Mark Salyzyn 7b736efe13 Merge "init: shutdown,thermal shut off display immediately" am: 82ee4060ed am: a27a48590a
am: 9c76b46e4e

Change-Id: I22c838b5183dae77f143cc45df52452c5f05915b
2017-09-27 15:04:23 +00:00
Mark Salyzyn 9c76b46e4e Merge "init: shutdown,thermal shut off display immediately" am: 82ee4060ed
am: a27a48590a

Change-Id: I419ffe6fab44d138d84c92c811a0b03ace796c1a
2017-09-27 15:02:40 +00:00
Mark Salyzyn a27a48590a Merge "init: shutdown,thermal shut off display immediately"
am: 82ee4060ed

Change-Id: I7c81548a3bbfefa8fadbe27d168708b2cb1d125a
2017-09-27 15:00:00 +00:00
Mark Salyzyn 82ee4060ed Merge "init: shutdown,thermal shut off display immediately" 2017-09-27 14:54:38 +00:00
Mark Salyzyn 27e56723de Merge changes I6620c996,I094c2cb0 into oc-mr1-dev
* changes:
  bootstat: bootloader stat files misspelled
  bootstat: switch from root.root to system.log
2017-09-27 14:53:53 +00:00
Elliott Hughes c450b2f668 Show the number of VMAs in the tombstone.
am: bab3354ede

Change-Id: I34faa36d3461a762ec559c58219aa03655dcee6e
2017-09-27 02:53:01 +00:00
Elliott Hughes bab3354ede Show the number of VMAs in the tombstone.
Tombstones (especially ones with lots of VMAs) are regularly truncated.
We can at least show the number of VMAs, though, for anyone interested
in knowing whether they got close to the default 64Ki limit.

Bug: http://b/66911122
Bug: 64709603 (presubmit balking at the line above)
Test: ran crasher, examined tombstone

(cherry picked from commit 868d39a82f)

Change-Id: I286db66f28f132307d573dbe5164efc969dc6ddc
2017-09-26 17:24:39 -07:00
Alexandros Frantzis 6ed0bd7991 Merge "libsync: Add fence info tests" am: 6832535cd5 am: b5876fe3ed
am: 8d19f45fe3

Change-Id: I0bf4f3ceebd3c5506c624b84a89766a7eec52981
2017-09-27 00:06:42 +00:00
Alexandros Frantzis 8d19f45fe3 Merge "libsync: Add fence info tests" am: 6832535cd5
am: b5876fe3ed

Change-Id: I39e75e653e645cc18b4fa43410f9d9b2a14adc3b
2017-09-27 00:02:37 +00:00
Alexandros Frantzis b5876fe3ed Merge "libsync: Add fence info tests"
am: 6832535cd5

Change-Id: I434ca616c410cf4898b8428d2035fc17220e618d
2017-09-26 23:58:18 +00:00
Treehugger Robot 6832535cd5 Merge "libsync: Add fence info tests" 2017-09-26 23:46:32 +00:00