Dan Albert
6c95c3edcd
Merge "Indicate that a packet was truncated." am: 046160959c am: e76c8020ba
...
am: c83ec67ec3
2017-06-27 23:06:56 +00:00
Dan Albert
c83ec67ec3
Merge "Indicate that a packet was truncated." am: 046160959c
...
am: e76c8020ba
2017-06-27 23:03:57 +00:00
Dan Albert
e76c8020ba
Merge "Indicate that a packet was truncated."
...
am: 046160959c
2017-06-27 23:00:57 +00:00
Treehugger Robot
046160959c
Merge "Indicate that a packet was truncated."
2017-06-27 22:50:48 +00:00
Todd Poynor
84c07a584a
healthd: notify listeners using local copy of list, drop lock am: fd68370074
...
am: 4d88b49320
2017-06-27 22:03:40 +00:00
Mark Salyzyn
872206fd80
Merge changes Ibe1feb39,I05be83e4,If1422e4d am: a4f086ab20 am: 3a156e6c2b
...
am: ca0c0bb96e
2017-06-27 21:57:34 +00:00
Mark Salyzyn
ca0c0bb96e
Merge changes Ibe1feb39,I05be83e4,If1422e4d am: a4f086ab20
...
am: 3a156e6c2b
2017-06-27 21:55:26 +00:00
Todd Poynor
8ffe398168
healthd: notify listeners using local copy of list, drop lock am: fd68370074
...
am: a1f4cddfea
2017-06-27 21:54:31 +00:00
Todd Poynor
a1f4cddfea
healthd: notify listeners using local copy of list, drop lock
...
am: fd68370074
2017-06-27 21:52:29 +00:00
Todd Poynor
4d88b49320
healthd: notify listeners using local copy of list, drop lock
...
am: fd68370074
2017-06-27 21:52:28 +00:00
Mark Salyzyn
3a156e6c2b
Merge changes Ibe1feb39,I05be83e4,If1422e4d
...
am: a4f086ab20
2017-06-27 21:52:06 +00:00
Treehugger Robot
a4f086ab20
Merge changes Ibe1feb39,I05be83e4,If1422e4d
...
* changes:
init.rc: setup console-ramoops-0
healthd: check console-ramoops-0
fs_mgr: check console-ramoops-0
2017-06-27 21:46:30 +00:00
Elliott Hughes
97f2fa94a5
Merge "Allow configuration of the number of tombstones." am: 3e8d923276 am: 216ac36534
...
am: 03cec0a7db
2017-06-27 21:06:57 +00:00
Elliott Hughes
03cec0a7db
Merge "Allow configuration of the number of tombstones." am: 3e8d923276
...
am: 216ac36534
2017-06-27 21:03:58 +00:00
Elliott Hughes
216ac36534
Merge "Allow configuration of the number of tombstones."
...
am: 3e8d923276
2017-06-27 21:01:16 +00:00
Elliott Hughes
3e8d923276
Merge "Allow configuration of the number of tombstones."
2017-06-27 20:57:08 +00:00
Dan Albert
9893f93950
Indicate that a packet was truncated.
...
Test: make checkbuild, check adb log
Bug: None
Change-Id: I0006ed284697f01966fdd79ca0b05dbc6d2eecf0
2017-06-27 13:26:14 -07:00
Todd Poynor
fd68370074
healthd: notify listeners using local copy of list, drop lock
...
Binder currently may service an incoming oneway transaction whenever
an outbound oneway call is made (if there is already a pending
incoming oneway call waiting). The unexpected nested method call
blocks forever on a recursive mutex acquire because healthd is single-
threaded. The binder behavior is considered a bug and may change in
the future. For now, work around this in healthd.
Make a local copy of the listeners list, then drop the lock and
perform the outbound calls on the local copy of the list.
Bug: 38201220
Test: Marlin with modified client calling scheduleUpdate() repeatedly
Change-Id: If35c2847556245921e2aff808ff747bb60356811
2017-06-27 11:58:17 -07:00
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
52c61939c3
Merge "libcutils: fs_config: fix "system/<partition>/" aliasing" am: 449bfd7a93 am: cd3584e90b
...
am: 609b4cf6a5
2017-06-26 22:54:10 +00:00
Ben Fennema
609b4cf6a5
Merge "libcutils: fs_config: fix "system/<partition>/" aliasing" am: 449bfd7a93
...
am: cd3584e90b
2017-06-26 22:52:09 +00:00
Ben Fennema
cd3584e90b
Merge "libcutils: fs_config: fix "system/<partition>/" aliasing"
...
am: 449bfd7a93
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
cb39742d3a
Merge "Revert "adb: turn on libusb by default."" am: b22067677e am: de931dab2d
...
am: 947a301852
2017-06-26 22:17:29 +00:00
Josh Gao
947a301852
Merge "Revert "adb: turn on libusb by default."" am: b22067677e
...
am: de931dab2d
2017-06-26 22:13:41 +00:00
Josh Gao
de931dab2d
Merge "Revert "adb: turn on libusb by default.""
...
am: b22067677e
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
Josh Gao
969110ca4a
Revert "adb: turn on libusb by default."
...
This reverts commit f2f0b31850http://b/62962248
Test: python test_device.py (with DeviceOfflineTest commented out)
Change-Id: Ia9de78ab772c22574cf5ca7facb78f22af6d7a71
2017-06-26 13:17:58 -07:00
Bowgo Tsai
61cdb66230
Merge "AVB: allow no metadata in the generic system.img for project Treble" am: c70bf5836c am: caa5b4417f
...
am: 2410d0c792
2017-06-24 01:51:47 +00:00
Bowgo Tsai
2410d0c792
Merge "AVB: allow no metadata in the generic system.img for project Treble" am: c70bf5836c
...
am: caa5b4417f
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
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
99d93f4462
Merge "init: create android::init:: namespace" am: 040212706b am: d3d79b2196
...
am: b57e1180e3
2017-06-23 23:24:21 +00:00
Tom Cherry
b57e1180e3
Merge "init: create android::init:: namespace" am: 040212706b
...
am: d3d79b2196
2017-06-23 23:19:53 +00:00
Tom Cherry
d3d79b2196
Merge "init: create android::init:: namespace"
...
am: 040212706b
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
Jeff Vander Stoep
d47d328b41
Merge "Revert "crash_dump: during early boot, output to kmsg on userdebug."" into oc-dr1-dev
...
am: 75a32dead5
2017-06-23 23:01:27 +00:00
TreeHugger Robot
75a32dead5
Merge "Revert "crash_dump: during early boot, output to kmsg on userdebug."" into oc-dr1-dev
2017-06-23 22:45:48 +00:00
NIEJuhu
4eaface969
Merge "libsysutils: Fix vold vulnerability in FrameworkListener" am: 45b4fe454a am: bac524b0cd
...
am: 56f021f0a4
2017-06-23 20:53:12 +00:00
NIEJuhu
56f021f0a4
Merge "libsysutils: Fix vold vulnerability in FrameworkListener" am: 45b4fe454a
...
am: bac524b0cd
2017-06-23 20:46:55 +00:00
Christopher Ferris
8f937188e2
Merge "Add section parsing and function name handling." am: 62a17c6c4a am: ee5c756d25
...
am: c37b983738
2017-06-23 20:43:42 +00:00
Christopher Ferris
c37b983738
Merge "Add section parsing and function name handling." am: 62a17c6c4a
...
am: ee5c756d25
2017-06-23 20:38:53 +00:00
NIEJuhu
bac524b0cd
Merge "libsysutils: Fix vold vulnerability in FrameworkListener"
...
am: 45b4fe454a
2017-06-23 20:38:40 +00:00
Jeff Vander Stoep
5fdc4cc746
Revert "crash_dump: during early boot, output to kmsg on userdebug."
...
This reverts commit bf2dd48241
2017-06-23 13:37:54 -07:00
Andreas Gampe
5b77682b0d
Merge "Debuggerd: Fix debuggerd_test" into oc-dr1-dev
...
am: 394c1ad959
2017-06-23 20:33:17 +00:00
