Commit Graph

36143 Commits

Author SHA1 Message Date
Bowgo Tsai af8315d4de Merge "fs_mgr_fstab: removing fs_mgr_get_entry_for_mount_point_after()" am: 16e31801a5
am: b08be62fca

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

Change-Id: Id187c62961faefbccd9d14c9adcf4d4476d6d66e
2017-09-29 09:37:19 +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
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
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 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 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 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 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
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
Tom Cherry 4a679454d7 init: cleanup exit() uses
Primarily, this fixes a bug where a forked child of property service
uses exit() instead of _exit, which has the unintended consequences of
running the global destructors of init proper, which leads to
unintended cleanup.

Secondly, this replaces the remaining calls of exit() that really
should be LOG(FATAL).

Test: boot sailfish
Change-Id: I779228e7d44a73186bc7685bb723c4b9278a0a2d
2017-09-26 16:30:03 -07:00
Bowgo Tsai d4ce377d8c Merge "fs_mgr_fstab: do an exact match when searching a mount point" am: a0dd1adab0
am: dff1e3418e

Change-Id: If1bfa9e7c69dadff162d79583b2a5cd5e1dba7bd
2017-09-26 23:20:06 +00:00
Bowgo Tsai dff1e3418e Merge "fs_mgr_fstab: do an exact match when searching a mount point"
am: a0dd1adab0

Change-Id: If29801d08031c83587e43f981f148f22a675dec5
2017-09-26 23:17:16 +00:00
Treehugger Robot a0dd1adab0 Merge "fs_mgr_fstab: do an exact match when searching a mount point" 2017-09-26 23:09:43 +00:00
Elliott Hughes f89042a43a Merge "Show the number of VMAs in the tombstone." am: 92c355cc4f
am: dae30de40c

Change-Id: Ie0a74c69155d7a6cb06fbd4e20caef2d69def631
2017-09-26 21:13:02 +00:00
Mark Salyzyn bfd05b69a5 init: shutdown,thermal shut off display immediately
Remove a source of heat.

Test: manual
Change-Id: I9a7391ddb121b6748a4f49f4b5bfb77453ca1514
2017-09-26 14:06:51 -07:00
Elliott Hughes dae30de40c Merge "Show the number of VMAs in the tombstone."
am: 92c355cc4f

Change-Id: Id6ac448ef7255eb76e792ba5985a6a305e5b2e9d
2017-09-26 21:06:31 +00:00
Treehugger Robot 92c355cc4f Merge "Show the number of VMAs in the tombstone." 2017-09-26 21:01:20 +00:00
Elliott Hughes 868d39a82f 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
Test: ran crasher, examined tombstone
Change-Id: I286db66f28f132307d573dbe5164efc969dc6ddc
2017-09-26 12:01:06 -07:00
Saurabh Shah 1db0e0e5b7 Merge "sync: store the num_fences from first SYNC_IOC_FILE_INFO" am: f7d14b643b
am: 53a13e5705

Change-Id: Iab1bb3b899965445087338ae01fbfb05c262027f
2017-09-26 18:00:05 +00:00
Saurabh Shah 53a13e5705 Merge "sync: store the num_fences from first SYNC_IOC_FILE_INFO"
am: f7d14b643b

Change-Id: I9c5ecaa30d4b08aa1eb327375c562dff6f78263e
2017-09-26 17:58:19 +00:00
Treehugger Robot f7d14b643b Merge "sync: store the num_fences from first SYNC_IOC_FILE_INFO" 2017-09-26 17:52:03 +00:00
Bowgo Tsai cc323958f9 fs_mgr_fstab: do an exact match when searching a mount point
Currently when searching a mount point from a fstab, it checks whether the
mount point of an fstab entry is the prefix of a given path, and the
next char after the match is either '\0' or '/'.

However, it will always return the fstab entry with mount point
"/vendor" when searching path is "/vendor", "/vendor/abc" or "/vendor/cde"
in the following fstab. Because "/vendor" is the prefix of "/vendor/abc"
and "/vendor/cde", and the next char after the match is '/'.

    /dev/block/platform/.../by-name/vendor   /vendor      ext4  ro  wait
    /dev/block/platform/.../by-name/abc      /vendor/abc  ext4  ro  wait
    /dev/block/platform/.../by-name/cde      /vendor/cde  ext4  ro  wait

Fix this by performing an exact match when searching the mount point.

Bug: 63912287
Test: boot sailfish

Change-Id: I504655f5c71790c5d528085de416ce3c30d21fea
2017-09-26 21:06:59 +08:00
Alexandros Frantzis 68223500ea libsync: Add fence info tests
This patch adds regression tests to check that the fence info returned
by libsync contains valid data.

Test: sync-unit-tests

Change-Id: I0c57c49b7be563efc9a43f12381059f20e0a4e52
Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
2017-09-26 13:09:35 +03:00
Tom Cherry 687cb99e96 Merge "Reland "Remove comments and code about ro.boot.slot"" am: dea5e081ac
am: 9bc2a967cf

Change-Id: I004d8761fca5c0d1b8b6f4e8546fc2ecf2f1f34c
2017-09-26 00:11:26 +00:00
Tom Cherry 9bc2a967cf Merge "Reland "Remove comments and code about ro.boot.slot""
am: dea5e081ac

Change-Id: Idf32e9600b6a3b93a6a2b4c414cc0193d5d65fb9
2017-09-26 00:08:55 +00:00
Tom Cherry dea5e081ac Merge "Reland "Remove comments and code about ro.boot.slot"" 2017-09-25 23:58:30 +00:00