Commit Graph

34061 Commits

Author SHA1 Message Date
Mark Salyzyn 4eb0ba058c init.rc: setup console-ramoops-0
On later kernels /sys/fs/pstore/console-ramoops becomes
/sys/fs/pstore/console-ramoops-0

Test: none
Bug: 63058217
Change-Id: Ibe1feb39ef9081b1ab2316510674bf181bdc7b0c
2017-06-27 09:32:38 -07:00
Mark Salyzyn 26f1dd764c healthd: check console-ramoops-0
On later kernels /sys/fs/pstore/console-ramoops becomes
/sys/fs/pstore/console-ramoops-0

Test: none
Bug: 63058217
Change-Id: I05be83e40dfc1730ed62b74a146123cdb8573ca6
2017-06-27 09:28:57 -07:00
Mark Salyzyn cab56c0ba5 fs_mgr: check console-ramoops-0
On later kernels /sys/fs/pstore/console-ramoops becomes
/sys/fs/pstore/console-ramoops-0

Test: none
Bug: 63058217
Change-Id: If1422e4df09b68c44f16608b1d191aeb6378c66b
2017-06-27 09:10:16 -07:00
Ben Fennema cd3584e90b Merge "libcutils: fs_config: fix "system/<partition>/" aliasing"
am: 449bfd7a93

Change-Id: I9f3d0f0e4dc147d9d2a5a1e41486805ada29d62a
2017-06-26 22:49:41 +00:00
Treehugger Robot 449bfd7a93 Merge "libcutils: fs_config: fix "system/<partition>/" aliasing" 2017-06-26 22:43:37 +00:00
Josh Gao de931dab2d Merge "Revert "adb: turn on libusb by default.""
am: b22067677e

Change-Id: I0fae08024b03bea8d03e9d5611575ebdba9b7e54
2017-06-26 22:01:36 +00:00
Treehugger Robot b22067677e Merge "Revert "adb: turn on libusb by default."" 2017-06-26 21:33:34 +00:00
Ben Fennema acd7b7b0c0 libcutils: fs_config: fix "system/<partition>/" aliasing
Pull prefix checking into fs_config_cmp and make prefix_cmp be a
glorified partial ? strncmp() : strcmp()

Results before:
[ RUN      ] fs_config.system_alias

[ ERROR ] system/core/libcutils/tests/fs_config.cpp:143:: vendor/lib/hw didn't match system/vendor/lib

[ ERROR ] system/core/libcutils/tests/fs_config.cpp:143:: system/vendor/bin/wifi didn't match vendor/bin/wifi

[ ERROR ] system/core/libcutils/tests/fs_config.cpp:143:: system/odm/bin/wifi didn't match odm/bin/wifi

[ ERROR ] system/core/libcutils/tests/fs_config.cpp:143:: system/oem/bin/wifi didn't match oem/bin/wifi
system/core/libcutils/tests/fs_config.cpp:247: Failure
Value of: check_fs_config_cmp(fs_config_cmp_tests)
  Actual: true
Expected: false
[  FAILED  ] fs_config.system_alias (6 ms)

Results after:
[ RUN      ] fs_config.system_alias
[       OK ] fs_config.system_alias (0 ms)

Bug: 62204623
Test: gTest libcutils-unit-test --gtest_filter=fs_config.*
Change-Id: I8282827002816e86ea3014fed29eabf43b837815
Signed-off-by: Ben Fennema <fennema@google.com>
2017-06-26 14:13:52 -07:00
Elliott Hughes 35bb6d2a89 Allow configuration of the number of tombstones.
Bug: http://b/62810514
Test: altered the property, got more tombstones
Change-Id: Iba8089915fa715658d2dfecb076c6a61321243bd
2017-06-26 14:00:00 -07:00
Tom Cherry b4dd881ffd ueventd: remove character device symlinks (/dev/usb/*)
While refactoring ueventd, I was looking for code the character device
symlinks (/dev/usb/*) that ueventd creates, such that I could test it
on a real device.  I found none in our tree, and history showing Xoom,
which was last supported years ago, was the last user.  If this code
is in fact obsolete, let's remove it.

Test: boot bullhead
Test: init unit tests

Change-Id: I601f7165eb06d36b31b6dcf69ee9e0a449d81a96
2017-06-26 13:58:57 -07:00
Josh Gao 969110ca4a Revert "adb: turn on libusb by default."
This reverts commit f2f0b31850.

libusb seems to be causing flakiness on some machines. Disable it for
now.

Bug: http://b/62962248
Test: python test_device.py (with DeviceOfflineTest commented out)
Change-Id: Ia9de78ab772c22574cf5ca7facb78f22af6d7a71
2017-06-26 13:17:58 -07:00
Bowgo Tsai 2410d0c792 Merge "AVB: allow no metadata in the generic system.img for project Treble" am: c70bf5836c
am: caa5b4417f

Change-Id: I4859e15d3bf05c22a708761e91b2e52fbb28ca1f
2017-06-24 01:40:33 +00:00
Bowgo Tsai caa5b4417f Merge "AVB: allow no metadata in the generic system.img for project Treble"
am: c70bf5836c

Change-Id: I583d9357df07c958778533599b9d91d00c255eb0
2017-06-24 01:35:01 +00:00
Treehugger Robot c70bf5836c Merge "AVB: allow no metadata in the generic system.img for project Treble" 2017-06-24 01:28:25 +00:00
Bowgo Tsai 60f19a0792 AVB: allow no metadata in the generic system.img for project Treble
The generic system.img released from project Treble can't contain any verity
metadata (e.g., vboot 1.0, AVB, or any other implementation) because it's
*generic*. To make any device can boot with it, `avbctl disable-verification`
is introduced to set a new flag AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED
in the top-level vbmeta to disable the entire AVB verification process. This
should be done prior to flash the generic system.img. See the following link
for details:

    https://android-review.googlesource.com/#/c/418399/

This CL checks whether AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED is
set in the top-level vbmeta. When set, skip verifying the vbmeta structs
against androidboot.vbmeta.{hash_alg, size, digest} because it will be
absent in kernel cmdline. Also, only top-level vbmeta struct is read then
returned by libavb in this case.

Note that another flag AVB_VBMETA_IMAGE_FLAGS_HASHTREE_DISABLED, usually
set by `adb disable-verity`, is used to signal fs_mgr to skip setting up
dm-verity, but libavb still verifies all vbmeta structs. fs_mgr will
also verify all vbmeta structs against androidboot.vbmeta.{hash_alg,
size, digest} from kernel cmdline as well.

Also rename SetUpAvb() to SetUpAvbHashtree() to better fit its usage.
This function will return kDisabled when any of the above two flags is set.

Finally, regardless of which flag is set or not set, we still only allow two
return values from avb_slot_verify():

   - AVB_SLOT_VERIFY_RESULT_OK: it's still possible to get this value
     when any of these flags are set in build time. e.g.,
     BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS=--flags 2

   - AVB_SLOT_VERIFY_RESULT_ERROR_VERIFICATION: in most cases we should
     get this value, because the flags are likely set at run time.

Bug: 62523303
Test: boot device with 'avbctl disable-verification'.
Test: boot device with 'avbctl enable-verification'.
Test: boot device with 'adb disable-verity'.
Test: boot device with 'adb enable-verity'.

Test: build image with BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS=--flags 2, then boot device.
      repeat the above steps to boot device again.

Change-Id: Ie8436f3e0e82c78490208f3b85eac5238a9fdfdb
2017-06-24 09:20:15 +08:00
Tom Cherry b57e1180e3 Merge "init: create android::init:: namespace" am: 040212706b
am: d3d79b2196

Change-Id: I3dccff251dda7d7452e33a7e71178c59f0c22169
2017-06-23 23:19:53 +00:00
Tom Cherry d3d79b2196 Merge "init: create android::init:: namespace"
am: 040212706b

Change-Id: Iff22100c7357ccc4a2a48c50b093375b5dd8a4b9
2017-06-23 23:15:21 +00:00
Tom Cherry 040212706b Merge "init: create android::init:: namespace" 2017-06-23 23:07:23 +00:00
NIEJuhu 56f021f0a4 Merge "libsysutils: Fix vold vulnerability in FrameworkListener" am: 45b4fe454a
am: bac524b0cd

Change-Id: I95154db2cad94aa4c9560b9abeec3c1967891d9f
2017-06-23 20:46:55 +00:00
Christopher Ferris c37b983738 Merge "Add section parsing and function name handling." am: 62a17c6c4a
am: ee5c756d25

Change-Id: Iaf9dd25a0982916c6c2b06bf7ba618e1b2b452e1
2017-06-23 20:38:53 +00:00
NIEJuhu bac524b0cd Merge "libsysutils: Fix vold vulnerability in FrameworkListener"
am: 45b4fe454a

Change-Id: I19d92353e5c425b4e8b1fd07e68da29975e2d991
2017-06-23 20:38:40 +00:00
Treehugger Robot 45b4fe454a Merge "libsysutils: Fix vold vulnerability in FrameworkListener" 2017-06-23 20:31:49 +00:00
Christopher Ferris ee5c756d25 Merge "Add section parsing and function name handling."
am: 62a17c6c4a

Change-Id: I010d9e6efa6d472242704be7a53e7bfeed24c4d5
2017-06-23 20:24:34 +00:00
Tom Cherry 81f5d3ebef init: create android::init:: namespace
With some small fixups along the way

Test: Boot bullhead
Test: init unit tests
Change-Id: I7beaa473cfa9397f845f810557d1631b4a462d6a
2017-06-23 13:21:20 -07:00
Christopher Ferris 62a17c6c4a Merge "Add section parsing and function name handling." 2017-06-23 20:18:35 +00:00
Tom Cherry 288fb7c2cc Merge "init: cleanup some string usage" am: 84c2eebbdd
am: 77382acf42

Change-Id: I068291aeb16249a1b82e047dc894c283114a2bef
2017-06-23 19:55:39 +00:00
Tom Cherry 77382acf42 Merge "init: cleanup some string usage"
am: 84c2eebbdd

Change-Id: Ic42cb28916c0e8d03db302985f66cb02a801af97
2017-06-23 19:47:07 +00:00
Tom Cherry 84c2eebbdd Merge "init: cleanup some string usage" 2017-06-23 19:40:24 +00:00
Christopher Ferris 8098b1c378 Add section parsing and function name handling.
Add the code to parse the Elf section headers.

Add the plumbing through of all the symbol handling code.

Add tests for all of this new functionality.

Bug: 23762183

Test: Pass new unit tests.
Change-Id: Ie2d90cbb3d7653c53251dbcf34d9e5d241278377
2017-06-23 10:51:28 -07:00
Narayan Kamath a153c7dd2a Merge "tombstoned: Improve message on java trace completion." am: 111f351762
am: 91492a56ca

Change-Id: I8eef67d2cca8370836bdfa1a246da19769edabf3
2017-06-23 08:26:19 +00:00
Narayan Kamath 91492a56ca Merge "tombstoned: Improve message on java trace completion."
am: 111f351762

Change-Id: I892987708bfee1106a09f10252ac5eee9bbf1a87
2017-06-23 08:20:53 +00:00
Narayan Kamath 111f351762 Merge "tombstoned: Improve message on java trace completion." 2017-06-23 08:12:51 +00:00
Andreas Gampe 293c0485b1 Debuggerd: Extend crash_dump timeout to 5 seconds
am: 4f5f558d38  -s ours

Change-Id: I7e91bb93fec66caef73744c7c7e62c927d7ba241
2017-06-23 06:11:36 +00:00
Andreas Gampe 4f5f558d38 Debuggerd: Extend crash_dump timeout to 5 seconds
Some processes have lots of threads and minidebug-info. Unwinding
these can take more than the original two seconds.

Bug: 62828735
Test: m
Test: debuggerd_test
Test: adb shell kill -s 6 `pid system_server`
Merged-In: I0041bd01753135ef9d86783a3c6a5cbca1c5bbad
Change-Id: I0041bd01753135ef9d86783a3c6a5cbca1c5bbad
(cherry picked from commit b02851a984)
2017-06-22 23:02:52 -07:00
Andreas Gampe 7dfcc376f7 Merge "Debuggerd: Extend crash_dump timeout to 5 seconds" am: b2bf7a5330
am: 21ca4e5d4a

Change-Id: I2b178cfb2d44bafa0759c1aa2fd510e93b39959a
2017-06-23 05:43:31 +00:00
Andreas Gampe 21ca4e5d4a Merge "Debuggerd: Extend crash_dump timeout to 5 seconds"
am: b2bf7a5330

Change-Id: I9c34419ddfcaf80b3f535c8c9a9aeace601f6af5
2017-06-23 05:38:31 +00:00
Treehugger Robot b2bf7a5330 Merge "Debuggerd: Extend crash_dump timeout to 5 seconds" 2017-06-23 05:31:14 +00:00
Andreas Gampe 067e0f0d85 Merge "Debuggerd: Fix debuggerd_test" am: 0c65c5c856
am: fb3a6e2391

Change-Id: I0cab14b4167fc612eea9f7b85ad120d5b9d2f8a8
2017-06-23 05:25:57 +00:00
Andreas Gampe fb3a6e2391 Merge "Debuggerd: Fix debuggerd_test"
am: 0c65c5c856

Change-Id: Iea265f9ef85f03ce28262203ff71aa3794eeee71
2017-06-23 05:21:32 +00:00
Treehugger Robot 0c65c5c856 Merge "Debuggerd: Fix debuggerd_test" 2017-06-23 05:14:38 +00:00
Hung-ying Tyan 66f4b9bf14 Merge "ld-config: Export android.hidl.memory@1.0-impl" into oc-dev-plus-aosp 2017-06-23 05:11:52 +00:00
Logan Chien 735a32e30e ld-config: Export android.hidl.memory@1.0-impl
am: fb2a4f0874

Change-Id: Ib23a91581514f275642cb05afddbfc5324bca3bb
2017-06-23 05:07:34 +00:00
Andreas Gampe b02851a984 Debuggerd: Extend crash_dump timeout to 5 seconds
Some processes have lots of threads and minidebug-info. Unwinding
these can take more than the original two seconds.

Bug: 62828735
Test: m
Test: debuggerd_test
Test: adb shell kill -s 6 `pid system_server`
Change-Id: I0041bd01753135ef9d86783a3c6a5cbca1c5bbad
2017-06-22 20:19:11 -07:00
Andreas Gampe 26cbafb892 Debuggerd: Fix debuggerd_test
Follow-up to commit 695713e931f0436aca56be9c0dacf2a5dd4e56e7 in
bionic. Change expectations of the abort callstack.

Test: mmma system/core/debuggerd
Test: adb shell /data/nativetest/debuggerd_test/debuggerd_test32
Test: adb shell /data/nativetest64/debuggerd_test/debuggerd_test64
Change-Id: I350a29ee1713a7ebdd50f2b9bdc2078c671e22c7
2017-06-22 20:19:11 -07:00
Jaesung Chung 87c76bea38 Merge "crash_dump: lower THREAD_COUNT in debuggerd_client.race for low-speed devices" am: 1dcee84294
am: 2dae23b0a7

Change-Id: I718e11efa5bf29b760647298dcca468248c4d7cb
2017-06-23 02:11:12 +00:00
Jaesung Chung 2dae23b0a7 Merge "crash_dump: lower THREAD_COUNT in debuggerd_client.race for low-speed devices"
am: 1dcee84294

Change-Id: Icde42e01e30e405902853df2996d23383fc8343e
2017-06-23 02:06:45 +00:00
Jaesung Chung 1dcee84294 Merge "crash_dump: lower THREAD_COUNT in debuggerd_client.race for low-speed devices" 2017-06-23 01:59:28 +00:00
Colin Cross ad0711b520 Merge "Fix stack test on arm32" am: 7ff1eb698c
am: 53e56177b5

Change-Id: I8f9f6f6db412888fef6ab752bacf634d6c460d30
2017-06-23 00:44:44 +00:00
Colin Cross 53e56177b5 Merge "Fix stack test on arm32"
am: 7ff1eb698c

Change-Id: Iea0a2a0e6f4658ec9b550216fc43f208f78122ae
2017-06-23 00:40:07 +00:00
Treehugger Robot 7ff1eb698c Merge "Fix stack test on arm32" 2017-06-23 00:31:44 +00:00