Josh Gao
14c8300a62
Merge "libdebuggerd: add timestamp to tombstones." am: ac64da1637
...
am: f1c2a0c2d5
2018-12-14 16:37:05 -08:00
Josh Gao
f1c2a0c2d5
Merge "libdebuggerd: add timestamp to tombstones."
...
am: ac64da1637
2018-12-14 16:26:57 -08:00
Josh Gao
ac64da1637
Merge "libdebuggerd: add timestamp to tombstones."
2018-12-15 00:12:24 +00:00
Mark Salyzyn
313c9cdd21
Merge "fs_mgr: overlayfs: test w/o sepolicy in enforced mode" am: 010a85afe5
...
am: 77a2f60a84
2018-12-14 14:45:49 -08:00
Mark Salyzyn
77a2f60a84
Merge "fs_mgr: overlayfs: test w/o sepolicy in enforced mode"
...
am: 010a85afe5
2018-12-14 14:41:35 -08:00
Treehugger Robot
010a85afe5
Merge "fs_mgr: overlayfs: test w/o sepolicy in enforced mode"
2018-12-14 22:27:17 +00:00
Josh Gao
6f4644d15b
libdebuggerd: add timestamp to tombstones.
...
Bug: http://b/120099273
Test: debuggerd_test
Change-Id: I457506f8d9920d969e1eba0265f85693b484f1a9
2018-12-14 13:29:52 -08:00
Mark Salyzyn
b9f4845cb4
Merge "llkd: make 100% sure process that triggers panic still exists" am: 00289c9c79
...
am: 48b6518541
2018-12-14 12:47:40 -08:00
Mark Salyzyn
48b6518541
Merge "llkd: make 100% sure process that triggers panic still exists"
...
am: 00289c9c79
2018-12-14 12:43:31 -08:00
Mark Salyzyn
00289c9c79
Merge "llkd: make 100% sure process that triggers panic still exists"
2018-12-14 20:35:08 +00:00
Bowgo Tsai
f7f7dea35c
Merge "fstab: allow mounting other slot" am: 9a7a50aea0
...
am: 4e32cb9f7a
2018-12-14 10:05:54 -08:00
Bowgo Tsai
4e32cb9f7a
Merge "fstab: allow mounting other slot"
...
am: 9a7a50aea0
2018-12-14 10:01:48 -08:00
Treehugger Robot
9a7a50aea0
Merge "fstab: allow mounting other slot"
2018-12-14 17:53:33 +00:00
Martin Stjernholm
3c530afbee
Merge "Use libdexfile external API in libunwindstack." am: 1d6969ccb9
...
am: 6b2cd22482
2018-12-14 06:06:37 -08:00
Martin Stjernholm
6b2cd22482
Merge "Use libdexfile external API in libunwindstack."
...
am: 1d6969ccb9
2018-12-14 05:55:55 -08:00
Martin Stjernholm
1d6969ccb9
Merge "Use libdexfile external API in libunwindstack."
2018-12-14 13:36:30 +00:00
Bowgo Tsai
4c80edf9cd
fstab: allow mounting other slot
...
Adding a new fs_mgr flag 'slotselect_other' to mount _b when _a is
active, or vice versa.
Bug: 113182233
Bug: 112103720
Test: `mount_all fstab.test` with one line using `slotselect_other`.
Change-Id: I96c63141df7722dc30ca9817b0b154e493b9eef9
2018-12-14 05:50:21 +00:00
Mark Salyzyn
4d83ed7e37
Merge "fs_mgr: overlayfs: test inAdb and inFastboot" am: 42c9e7e393
...
am: 245ad039f1
2018-12-13 20:27:07 -08:00
Mark Salyzyn
245ad039f1
Merge "fs_mgr: overlayfs: test inAdb and inFastboot"
...
am: 42c9e7e393
2018-12-13 20:22:58 -08:00
Treehugger Robot
42c9e7e393
Merge "fs_mgr: overlayfs: test inAdb and inFastboot"
2018-12-14 04:12:12 +00:00
Mark Salyzyn
436464ab71
fs_mgr: overlayfs: test w/o sepolicy in enforced mode
...
Skip sepolicy test if device is not in enforcing mode.
Test: adb-remount-test.sh
Change-Id: I1558674819bda0c9f575d5202f693fec55c9d84f
2018-12-13 16:48:41 -08:00
Mark Salyzyn
f7572ec8ff
fs_mgr: overlayfs: test inAdb and inFastboot
...
If no serial number is supplied, then check if there is 0 devices
Test: adb-remount-test.sh
Change-Id: Ie78c379078d3d99d67594a5be1a22795bfcc6d36
2018-12-13 16:19:35 -08:00
Tom Cherry
8a9ddccb20
Merge "fs_mgr: allow boot_devices to be supplies on the kernel commandline" am: 8f1fcd5b94
...
am: 0be6513e9a
2018-12-13 15:37:02 -08:00
Christopher Ferris
c18c04d8e6
Merge "Do not remove speculative frames in all cases." am: 0d7c0f78c4
...
am: b99ec5454f
2018-12-13 15:35:14 -08:00
Nick Kralevich
73c91cbc1f
Merge "relax /system/bin directory permissions" am: b5ab83903c
...
am: ee6c1be99d
2018-12-13 15:31:39 -08:00
Tom Cherry
0be6513e9a
Merge "fs_mgr: allow boot_devices to be supplies on the kernel commandline"
...
am: 8f1fcd5b94
2018-12-13 14:56:37 -08:00
Christopher Ferris
b99ec5454f
Merge "Do not remove speculative frames in all cases."
...
am: 0d7c0f78c4
2018-12-13 14:55:06 -08:00
Nick Kralevich
ee6c1be99d
Merge "relax /system/bin directory permissions"
...
am: b5ab83903c
2018-12-13 14:51:46 -08:00
Treehugger Robot
8f1fcd5b94
Merge "fs_mgr: allow boot_devices to be supplies on the kernel commandline"
2018-12-13 22:28:34 +00:00
Tom Cherry
8cfa1877fb
Merge "Allow specifying vbmeta/parts via fstab" am: 41216e591b
...
am: 3028c9f3f2
2018-12-13 14:16:02 -08:00
Mark Salyzyn
8437a7c5ad
Merge changes Ic9957cb3,If7ae257c am: 8f3ed62422
...
am: 9529bbe0e7
2018-12-13 14:11:38 -08:00
Tom Cherry
3028c9f3f2
Merge "Allow specifying vbmeta/parts via fstab"
...
am: 41216e591b
2018-12-13 13:56:42 -08:00
Mark Salyzyn
9529bbe0e7
Merge changes Ic9957cb3,If7ae257c
...
am: 8f3ed62422
2018-12-13 13:52:59 -08:00
Xin Li
f9383ce857
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 72335650ef -s ours
...
am: 77f2dbffe1
2018-12-13 13:34:39 -08:00
Xin Li
77f2dbffe1
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
...
am: 72335650ef
2018-12-13 13:30:27 -08:00
Christopher Ferris
0d7c0f78c4
Merge "Do not remove speculative frames in all cases."
2018-12-13 21:04:44 +00:00
Treehugger Robot
b5ab83903c
Merge "relax /system/bin directory permissions"
2018-12-13 20:54:25 +00:00
Xin Li
fc7913888a
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 2f2f638fdf -s ours
...
am: 0acfc87001
2018-12-13 12:21:31 -08:00
Xin Li
0acfc87001
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
...
am: 2f2f638fdf
2018-12-13 11:26:27 -08:00
Tom Cherry
6bbe9477f3
fs_mgr: allow boot_devices to be supplies on the kernel commandline
...
boot_devices in device tree is our last remaining device tree entry
for specifying the kernel commandline. Since this doesn't make sense
to be included in the fstab, especially as there is no way to
differentiate between different boot devices within a single device
tree as some devices do, it is moved to the kernel commandline.
Bug: 117933812
Test: boot blueline without boot_devices in DT
Change-Id: If498836ae2ef14e68ff761338ef352c20c4a7b3d
2018-12-13 11:13:28 -08:00
Christopher Ferris
dd81e8d29a
Merge "Fix handling of ro segments for embedded libs." am: 583ce2deff
...
am: 1b080f4548
2018-12-13 11:11:52 -08:00
Josh Gao
7cf23f663e
Merge changes I042f25f8,I973f42c5,Icb4acea5 am: 78f94a39f2
...
am: 96cf6ece63
2018-12-13 11:11:11 -08:00
Tom Cherry
1a28bf2d81
Merge "fs_mgr: remove -Wno-unused-variable from cflags" am: fc216d664a
...
am: b65ce990fa
2018-12-13 11:09:51 -08:00
Nick Kralevich
53842f8a90
relax /system/bin directory permissions
...
In commit f4fc922f0bhttps://android-review.googlesource.com/c/platform/system/core/+/822955
for details.
This change causes the Chase banking app to crash. This is because
the Chase app is using inotify_add_watch() on the /system/bin directory
and not checking the return value.
The Android Security model guarantees the immutability of files in
/system/bin, so the inotify watch is unnecessary.
Until the Chase app fixes their bug, we need to relax the permissions on
the /system/bin directory. Conceptually, this is a partial revert of
f4fc922f0b
2018-12-13 10:56:33 -08:00
Christopher Ferris
1b080f4548
Merge "Fix handling of ro segments for embedded libs."
...
am: 583ce2deff
2018-12-13 10:51:00 -08:00
Josh Gao
96cf6ece63
Merge changes I042f25f8,I973f42c5,Icb4acea5
...
am: 78f94a39f2
2018-12-13 10:50:25 -08:00
Tom Cherry
b65ce990fa
Merge "fs_mgr: remove -Wno-unused-variable from cflags"
...
am: fc216d664a
2018-12-13 10:49:33 -08:00
Christopher Ferris
065f156195
Do not remove speculative frames in all cases.
...
If the first frame of an unwind is a totally invalid pc that's not in
any map, a speculative frame is added. Rather than deleting this frame
if no more unwinding is possible, leave it. This fixes a case where
the only frame you get is an invalid one, but the speculative frame
winds up in a shared library or somewhere else and gets removed.
Bug: 120505086
Test: New unit tests to catch this case pass.
Test: Verified original crashing program now emits two backtrace lines.
Change-Id: I088dff21c057386dcdaeb3fc2578b24322683bd0
2018-12-13 10:41:08 -08:00
Tom Cherry
41216e591b
Merge "Allow specifying vbmeta/parts via fstab"
2018-12-13 18:24:34 +00:00
Martin Stjernholm
444e23d2fc
Use libdexfile external API in libunwindstack.
...
Test: mmma system/core/{libunwindstack,libbacktrace}, run host gtests
Test: Make image, flash, and reboot device.
Bug: 119632407
Change-Id: I370f089a1b20ba432e136818b4325d46f99df708
2018-12-13 17:58:23 +00:00
