Commit Graph

29357 Commits

Author SHA1 Message Date
Bowgo Tsai cecfaff6cd Merge "fs_mgr_avb_ops: stores the by-name prefix of /misc instead of fstab struct" am: 5c4af9698c
am: 474897035d

Change-Id: I3f26e5adc173cfd448bb300c39f5320b967712ae
2017-03-31 04:34:05 +00:00
Bowgo Tsai 474897035d Merge "fs_mgr_avb_ops: stores the by-name prefix of /misc instead of fstab struct"
am: 5c4af9698c

Change-Id: I588ab02220cab9cdea7331c17e1d1c2eccdeaf06
2017-03-31 04:28:38 +00:00
Treehugger Robot 5c4af9698c Merge "fs_mgr_avb_ops: stores the by-name prefix of /misc instead of fstab struct" 2017-03-31 04:10:37 +00:00
Bowgo Tsai 1c7f528f4e Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition" am: 2e0f8a3b13
am: ec10a51d7d

Change-Id: I89d10accb3fc61cbe14627dad26d8a22d4e91543
2017-03-31 03:52:01 +00:00
Bowgo Tsai ec10a51d7d Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition"
am: 2e0f8a3b13

Change-Id: I1988aa57887ddbdc8f86c38224892cfaf142e428
2017-03-31 03:50:01 +00:00
Treehugger Robot 2e0f8a3b13 Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition" 2017-03-31 03:46:25 +00:00
Josh Gao ca7bea8c0a Merge changes I20670684,If38c6d14,I94889125,I66169ed5 am: 85a6ca459f
am: a1b9fbda53

Change-Id: Id3bdc59f244473c0430ab02899b8506d1496b3b8
2017-03-31 02:41:58 +00:00
Josh Gao a1b9fbda53 Merge changes I20670684,If38c6d14,I94889125,I66169ed5
am: 85a6ca459f

Change-Id: Ia0b4c5994c48e1c23a72585c2c57a35ad324ac98
2017-03-31 02:39:30 +00:00
Treehugger Robot 85a6ca459f Merge changes I20670684,If38c6d14,I94889125,I66169ed5
* changes:
  tombstoned: add tests for b/36685795.
  tombstoned: fix a race between intercept and crash_dump.
  tombstoned: refactor request dequeuing a bit.
  tombstoned: don't increment num_concurrent_dumps until success.
2017-03-31 02:37:22 +00:00
Bowgo Tsai f5bbfd64a9 fs_mgr_avb_ops: stores the by-name prefix of /misc instead of fstab struct
fs_mgr_avb_ops->read_from_partition() relies on the by-name prefix to
get the device file when reading a partition. Previously we store the
fstab struct and use fs_mgr_get_entry_for_mount_point() for every read.

It's better to do that once and store the by-name prefix for later use.

Bug: 33254008
Test: test AVB on bullhead
Change-Id: Ie999851b529f984e29ccbf39fb52a8220056fe0c
2017-03-31 10:25:04 +08:00
Wonsik Kim 9817f4f317 Merge "Revert "init: use read_file and write_file to implement do_copy builtin"" am: 3428d0c2c0
am: 02d720eb27

Change-Id: I72a4db587b3aea081aab1d0dd3eefd714c46f8e1
2017-03-31 00:43:12 +00:00
Wonsik Kim 02d720eb27 Merge "Revert "init: use read_file and write_file to implement do_copy builtin""
am: 3428d0c2c0

Change-Id: Ib805dca4b5f8c126538408b93f422a4924c3b844
2017-03-31 00:32:48 +00:00
Wonsik Kim 3428d0c2c0 Merge "Revert "init: use read_file and write_file to implement do_copy builtin"" 2017-03-31 00:22:00 +00:00
Wonsik Kim 395e29472f Revert "init: use read_file and write_file to implement do_copy builtin"
This reverts commit 82bac0de6d.

Change-Id: Ibfdf453bd85ba4fcd1948b78bd22e639a883653e
2017-03-31 00:18:13 +00:00
Josh Gao cf476c9360 Merge "Revert "adb: check our socketpair ends in our win32 emulation."" am: c1314c8b13
am: 83b3c0817f

Change-Id: I316e666330a3e9ae7ff4cf8fca43fdf803d5612c
2017-03-30 23:59:17 +00:00
Josh Gao 83b3c0817f Merge "Revert "adb: check our socketpair ends in our win32 emulation.""
am: c1314c8b13

Change-Id: I4eaca80573fc3b17ff312eae2e9e4598a0bcf55a
2017-03-30 23:56:45 +00:00
Josh Gao c1314c8b13 Merge "Revert "adb: check our socketpair ends in our win32 emulation."" 2017-03-30 23:54:24 +00:00
Josh Gao 352a84574d tombstoned: add tests for b/36685795.
Add some tests for edge cases which may have triggered b/36685795.

Bug: http://b/36685795
Test: debuggerd_test
Change-Id: I20670684c8dae422af157be21e44ba5d6d3214d3
2017-03-30 16:49:19 -07:00
Josh Gao 460b336d6a tombstoned: fix a race between intercept and crash_dump.
Previously, there was no way to detect when tombstoned processed an
intercept request packet, making it possible for a intercept request
followed by a crash_dump being processed in the wrong order.

Add a response to intercept registration, to eliminate this race.

Test: debuggerd_test
Change-Id: If38c6d14081ebc86ff1ed0edd7afaeafc40a8381
2017-03-30 16:49:02 -07:00
Josh Gao 807a45807b tombstoned: refactor request dequeuing a bit.
Also make it loop, so that upon failing to start a dequeued crash
request, we continue to the next one.

Bug: http://b/36685795
Test: debuggerd_test
Change-Id: I94889125f16f4681c6fa0fa9cac456302602ce01
2017-03-30 16:19:53 -07:00
Calin Juravle 70000789c4 Merge "Set libnativeloader style to clang-format-2" am: 23fc5afa2d
am: d6a061baab

Change-Id: I143be51670af0e2ef32ff906b054c38295876109
2017-03-30 22:35:25 +00:00
Calin Juravle 8a97bdd6c3 Merge "Set libnativebridge style to clang-format-2" am: 2c317ceaba
am: cb5a3425f7

Change-Id: I9f6cb9fb4fcc12630c82def41f3eb5e15a32a946
2017-03-30 22:35:11 +00:00
Calin Juravle d6a061baab Merge "Set libnativeloader style to clang-format-2"
am: 23fc5afa2d

Change-Id: I893a65248f8fee6098d4def6e72d2fbff41a77e1
2017-03-30 22:33:23 +00:00
Calin Juravle cb5a3425f7 Merge "Set libnativebridge style to clang-format-2"
am: 2c317ceaba

Change-Id: I5d88f5f50bcacc940257207f127df5002ab18621
2017-03-30 22:33:10 +00:00
Calin Juravle 23fc5afa2d Merge "Set libnativeloader style to clang-format-2" 2017-03-30 22:28:06 +00:00
Calin Juravle 2c317ceaba Merge "Set libnativebridge style to clang-format-2" 2017-03-30 22:27:56 +00:00
Josh Gao 13078245a0 tombstoned: don't increment num_concurrent_dumps until success.
Previously, we would increment num_concurrent_dumps and fail to
decrement it if we failed to start the request. Change this to
only increment after we've successfully started the dump.

Bug: http://b/36685795
Test: debuggerd_test
Change-Id: I66169ed56ed44271e1d8fe1298d95260be7a32a3
2017-03-30 14:51:38 -07:00
Josh Gao 3726a0195b Revert "adb: check our socketpair ends in our win32 emulation."
This reverts commit 5990191c4e.

Some Windows users are seeing mismatches between the two ends.

Bug: https://code.google.com/p/android/issues/detail?id=258400
Test: mma
Change-Id: Ie3a121a2754332608ff64b3b016adcb4258d41f3
2017-03-30 13:12:37 -07:00
Dan Shi 838b61c11f Merge "Add test config to libcutils_test_static" am: c65f842cd1
am: ad6c88f108

Change-Id: I3f6e77a45949d7685f2fc09776f2c34cd3ca879c
2017-03-30 18:31:25 +00:00
Dan Shi ad6c88f108 Merge "Add test config to libcutils_test_static"
am: c65f842cd1

Change-Id: I98db0493d3afedfa872bc25e943adba800c007b6
2017-03-30 18:29:24 +00:00
Treehugger Robot c65f842cd1 Merge "Add test config to libcutils_test_static" 2017-03-30 18:26:33 +00:00
Christopher Ferris 0da11818af Merge "Add DwarfMemory class." am: ce12417925
am: 052dd1ba53

Change-Id: Ib9711fb0eb80779b38799a0dc1a4c3d7f05fb049
2017-03-30 18:16:54 +00:00
Christopher Ferris 052dd1ba53 Merge "Add DwarfMemory class."
am: ce12417925

Change-Id: If3928bf14f25d792f512b3a67cdc5b05c14e7f0a
2017-03-30 18:14:53 +00:00
Christopher Ferris ce12417925 Merge "Add DwarfMemory class." 2017-03-30 18:10:29 +00:00
Bowgo Tsai 37a0b318ef fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition
get_hashtree_descriptor() currently restricts HASHTREE descriptor to be
either in /vbmeta or in the same partition for dm-verity setup.

Also allows it to be from /boot partition because the top-level vbmeta
might be appended at /boot in legacy devices without /vbmeta.

Bug: 35880930
Test: test AVB on bullhead with top-level vbmeta being at /boot
Change-Id: I1ebd16a3c9f17bced6055146e8843b5918a737eb
2017-03-30 20:37:12 +08:00
Dan Shi d8f533aab2 Add test config to libcutils_test_static
Design doc:
Generalized Suites & the Unification of APCT & CTS Workflows Design/Roadmap
https://docs.google.com/document/d/1eabK3srlBLouMiBMrNP3xJPiRRdcoCquNxC8gBWPvx8/edit#heading=h.78vup5eivwzo

Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test
Change-Id: I9faa1c929fff43635aff06b4228501e1227c4d06
2017-03-29 23:13:08 -07:00
Keun-young Park 72d44ae00c Merge "send SIGTERM only once" am: 9ead7c4a74
am: ba54f32b0a

Change-Id: Ib13d0285f00b224cffdc4b23552d0196c0c0f697
2017-03-30 04:17:35 +00:00
Keun-young Park ba54f32b0a Merge "send SIGTERM only once"
am: 9ead7c4a74

Change-Id: I87ac8e4402207719dd6cebb05adc0a3e1c2afbfe
2017-03-30 04:15:04 +00:00
Treehugger Robot 9ead7c4a74 Merge "send SIGTERM only once" 2017-03-30 04:10:41 +00:00
Keun-young Park cb52d51488 Merge "add killProcessGroupOnce" am: c8a575588a
am: d140cc9bf3

Change-Id: I3eed238ea53e497d3108ea21919522c235e9830a
2017-03-30 01:56:55 +00:00
Keun-young Park d140cc9bf3 Merge "add killProcessGroupOnce"
am: c8a575588a

Change-Id: I5382136149b2d7916fe3d891fe04fd79ade97bb2
2017-03-30 01:55:24 +00:00
Treehugger Robot c8a575588a Merge "add killProcessGroupOnce" 2017-03-30 01:46:59 +00:00
Sandeep Patil fb79b10200 Merge "init: consolidate restorecon after selinux initialization in single function" am: 273a0624c5
am: 68fb7c0bbb

Change-Id: I2189cbff8e97b3aaa5bd335806d5d1ea9ea21225
2017-03-30 00:53:50 +00:00
Sandeep Patil 68fb7c0bbb Merge "init: consolidate restorecon after selinux initialization in single function"
am: 273a0624c5

Change-Id: I417d2bee37d91fa27eb7819ef463552d48c1f36d
2017-03-30 00:51:50 +00:00
Treehugger Robot 273a0624c5 Merge "init: consolidate restorecon after selinux initialization in single function" 2017-03-30 00:48:04 +00:00
Calin Juravle c169b2018f Set libnativeloader style to clang-format-2
Test: clang-format.py ...
Change-Id: I322c134c1e6b58b2c4ea21b6dfac5727860604c2
2017-03-29 17:33:12 -07:00
Calin Juravle bac9807247 Set libnativebridge style to clang-format-2
Test: clang-format.py ...
Change-Id: Ie08ae6a056f0381590e202a597042fb2490af530
2017-03-29 17:29:57 -07:00
Wei Wang 80de24f484 libcutils: remove schedgroup fds [DO NOT MERGE]
am: bcb6419fc9  -s ours

Change-Id: Ib8af1c5c4066d280811211c28c9388574813028d
2017-03-30 00:06:17 +00:00
Keun-young Park acd55b39fe send SIGTERM only once
- Processes capturing SIGTERM signal will not terminate and
  killProcessGroup will timeout after retry. This gives 200ms
  of waiting per such process. Change it to retry only once as
  SIGTERM will keep failing for such process.

bug: 36696408
Test: check time spent in SIGTERM for reboot
Change-Id: I9b0843614598dd3f97a50b21352046297ed70b6b
2017-03-29 16:33:25 -07:00
Keun-young Park fac4b63eff add killProcessGroupOnce
- killProcessGroup retries if it fails while
  killProcessGroupOnce only tries once.
- useful for sending signal like SIGTERM once.

bug: 36696408
Test: will add usage to init
Change-Id: Ia1e3d4ec848e785a3238f262b02914695cded4c7
2017-03-29 16:33:15 -07:00