Jeffrey Vander Stoep
9f66e4465e
Merge "selinux: use the policy version defined in sepolicy" am: e21d07fbab
...
am: 75c256ca4a
2019-03-19 15:19:55 -07:00
Jeffrey Vander Stoep
75c256ca4a
Merge "selinux: use the policy version defined in sepolicy"
...
am: e21d07fbab
2019-03-19 15:03:29 -07:00
Jeffrey Vander Stoep
e21d07fbab
Merge "selinux: use the policy version defined in sepolicy"
2019-03-19 21:44:59 +00:00
Josh Gao
e4f6d9141b
Merge "debuggerd_handler: demote abort on exec failure to log." am: 965d0c38c8
...
am: 80ffda8ff0
2019-03-19 12:58:29 -07:00
Josh Gao
1e43373c62
Merge "adbd: support ro.adb.nonblocking_ffs." am: affe351420
...
am: c94cec6d9d
2019-03-19 12:55:36 -07:00
Josh Gao
80ffda8ff0
Merge "debuggerd_handler: demote abort on exec failure to log."
...
am: 965d0c38c8
2019-03-19 12:54:19 -07:00
Josh Gao
c94cec6d9d
Merge "adbd: support ro.adb.nonblocking_ffs."
...
am: affe351420
2019-03-19 12:51:09 -07:00
Josh Gao
965d0c38c8
Merge "debuggerd_handler: demote abort on exec failure to log."
2019-03-19 19:44:43 +00:00
Josh Gao
affe351420
Merge "adbd: support ro.adb.nonblocking_ffs."
2019-03-19 19:44:00 +00:00
Mark Salyzyn
8e9b7ffe32
Merge "fs_mgr: overlay: suppress noise associated with test mounting scratch partition" am: 0eadef4076
...
am: 07ab1750dd
2019-03-19 12:15:19 -07:00
Mark Salyzyn
07ab1750dd
Merge "fs_mgr: overlay: suppress noise associated with test mounting scratch partition"
...
am: 0eadef4076
2019-03-19 12:10:07 -07:00
Treehugger Robot
0eadef4076
Merge "fs_mgr: overlay: suppress noise associated with test mounting scratch partition"
2019-03-19 18:58:41 +00:00
Yi Kong
4260f8b2cb
Merge "Suppress -Wstring-plus-int warning" am: 63c89a37fd
...
am: c144802d6b
2019-03-19 11:50:13 -07:00
Yi Kong
c144802d6b
Merge "Suppress -Wstring-plus-int warning"
...
am: 63c89a37fd
2019-03-19 11:46:18 -07:00
Yi Kong
63c89a37fd
Merge "Suppress -Wstring-plus-int warning"
2019-03-19 18:37:43 +00:00
Xiaoyong Zhou
f0ac994384
Merge "Enable fsverity signature checking" am: aaee497db2
...
am: 0d8d105e32
2019-03-19 10:05:05 -07:00
Xiaoyong Zhou
0d8d105e32
Merge "Enable fsverity signature checking"
...
am: aaee497db2
2019-03-19 09:56:18 -07:00
Treehugger Robot
aaee497db2
Merge "Enable fsverity signature checking"
2019-03-19 16:40:48 +00:00
Roland Levillain
315a0513f1
Merge "Include tests directories in the linker legacy configuration." am: d503239292
...
am: 5481e3aec8
2019-03-19 05:30:58 -07:00
Roland Levillain
5481e3aec8
Merge "Include tests directories in the linker legacy configuration."
...
am: d503239292
2019-03-19 05:24:49 -07:00
Roland Levillain
d503239292
Merge "Include tests directories in the linker legacy configuration."
2019-03-19 10:17:10 +00:00
Neil Fuller
d836b1dca9
Merge "Address syntax / error case nits" am: ed6b5177e2
...
am: 6ac873c3b9
2019-03-19 02:54:38 -07:00
Neil Fuller
6ac873c3b9
Merge "Address syntax / error case nits"
...
am: ed6b5177e2
2019-03-19 02:50:30 -07:00
Neil Fuller
ed6b5177e2
Merge "Address syntax / error case nits"
2019-03-19 09:37:55 +00:00
Yi Kong
dd2ea5fd68
Suppress -Wstring-plus-int warning
...
The code section is already marked as to be removed, simply suppress
the -Wstring-plus-int warning.
Test: m checkbuild
Bug: 128878287
Change-Id: I95a03aca90dbb5d27db49f5baf534cbaacf9b830
2019-03-18 22:16:14 -07:00
Josh Gao
4ba1491a38
Merge "adb: fix uninitialized variable." am: 588a87d68e
...
am: 966b39b34c
2019-03-18 20:32:54 -07:00
Josh Gao
966b39b34c
Merge "adb: fix uninitialized variable."
...
am: 588a87d68e
2019-03-18 20:20:43 -07:00
Treehugger Robot
588a87d68e
Merge "adb: fix uninitialized variable."
2019-03-19 03:14:17 +00:00
Victor Hsieh
9184213f3f
Merge "mini-keyctl: use ParseInt to parse keys" am: 8aa059438d
...
am: 54f3e37edd
2019-03-18 18:13:08 -07:00
Josh Gao
8038e35fdf
adbd: support ro.adb.nonblocking_ffs.
...
Allow disabling ro.adb.nonblocking_ffs via an ro system property, which
gets overridden by the currently supported persist.adb.nonblocking_ffs.
Bug: http://b/128679787
Test: mma
Change-Id: I28891d2da129e9654bf63ab8a4c330c4d2f5b336
2019-03-18 17:59:24 -07:00
Victor Hsieh
54f3e37edd
Merge "mini-keyctl: use ParseInt to parse keys"
...
am: 8aa059438d
2019-03-18 17:48:15 -07:00
Treehugger Robot
8aa059438d
Merge "mini-keyctl: use ParseInt to parse keys"
2019-03-19 00:25:52 +00:00
Josh Gao
b019574476
adb: fix uninitialized variable.
...
Previously, we were initializing IoBlock::pending when submitting a read,
but leaving it uninitialized when doing a write, which would sometimes
result in an assertion firing when we received a previously allocated
block of memory that happened to have a nonzero value in pending.
Test: treehugger
Change-Id: I434c65f554ceed313fea9cfcc98788908f3ca8bc
2019-03-18 17:12:19 -07:00
Victor Hsieh
f4b10e031a
Merge "mini-keyctl cleanup: keep local funcitons static" am: e16a253cb0
...
am: 1dd49e2de4
2019-03-18 15:17:08 -07:00
Victor Hsieh
1dd49e2de4
Merge "mini-keyctl cleanup: keep local funcitons static"
...
am: e16a253cb0
2019-03-18 15:12:01 -07:00
Treehugger Robot
e16a253cb0
Merge "mini-keyctl cleanup: keep local funcitons static"
2019-03-18 22:08:46 +00:00
Josh Gao
5e8d68c2b2
debuggerd_handler: demote abort on exec failure to log.
...
If a process is ptraced already, we might not be able to exec crash_dump
due to selinux. Since we can be called for non-fatal events, we
shouldn't abort in that case.
Bug: http://b/128054996
Test: treehugger
Change-Id: I1442041caa7af908df2ab87b9e010c44082e7587
2019-03-18 14:39:47 -07:00
Xiaoyong Zhou
66fc7eb195
Enable fsverity signature checking
...
This CL enable fsverity signature checking.
Bug: 112038861
Test: cat /proc/sys/fs/verity/require_signatures -> 1
Change-Id: I57aaf6094aa503bdcac93306cafd7f71f202e711
2019-03-18 14:28:18 -07:00
Mark Salyzyn
d5d05a12e2
Merge "Check if we need to Poll for devices after RegenerateUevents" am: 06e6b8551a
...
am: 25ccd57180
2019-03-18 14:24:18 -07:00
Greg Kaiser
507be15cf8
Merge "adb: Fix return value in error case" am: 2925a580e9
...
am: 73308830a6
2019-03-18 14:22:51 -07:00
David Anderson
d8987190e7
Merge changes I88689889,Ibfd66734 am: e2d977bffd
...
am: 53fabb5a09
2019-03-18 14:21:25 -07:00
Mark Salyzyn
25ccd57180
Merge "Check if we need to Poll for devices after RegenerateUevents"
...
am: 06e6b8551a
2019-03-18 14:11:10 -07:00
Treehugger Robot
06e6b8551a
Merge "Check if we need to Poll for devices after RegenerateUevents"
2019-03-18 21:03:11 +00:00
Greg Kaiser
73308830a6
Merge "adb: Fix return value in error case"
...
am: 2925a580e9
2019-03-18 14:01:02 -07:00
David Anderson
53fabb5a09
Merge changes I88689889,Ibfd66734
...
am: e2d977bffd
2019-03-18 14:00:01 -07:00
Victor Hsieh
0fb290bb8a
mini-keyctl: use ParseInt to parse keys
...
- Valid ID format examples: 0x90a, 123
- ID like 90a will not work now.
Bug: None
Test: mini-keyctl unlink 0x11d25c86 0x2873c96d
Change-Id: I057bce0a49a60f475d54b23e28dc18db25124466
2019-03-18 13:57:05 -07:00
Treehugger Robot
2925a580e9
Merge "adb: Fix return value in error case"
2019-03-18 20:32:46 +00:00
David Anderson
e2d977bffd
Merge changes I88689889,Ibfd66734
...
* changes:
liblp: Reclaim wasted space from unaligned partitions, v2.
Revert "liblp: Reclaim wasted space from unaligned partitions."
2019-03-18 20:09:44 +00:00
Mark Salyzyn
60a76f330c
fs_mgr: overlay: suppress noise associated with test mounting scratch partition
...
Add internal fs_mgr_is_ext4 and fs_mgr_is_f2fs to get heads up on
mount failures and thus bypass trying.
Test: adb-remount-test.sh
Bug: 109821005
Change-Id: Ieb1f8c19ced930b6fe2d1791ef710ce528da7e37
2019-03-18 12:50:00 -07:00
Roland Levillain
5c99a0c067
Include tests directories in the linker legacy configuration.
...
Make ld.config.legacy.txt similar to other linker configurations with
respect to tests in /data/{nativetest,benchmarktest}{,64}.
Note: The linker legacy configuration is used by the ART generic build
targets, defined in project device/generic/art.
Test: ART chroot-based on-device testing using the master-art
Bug: 121117762
Change-Id: I6c8fafa2568862e450aa7b9fea1177a184cb9705
2019-03-18 19:07:32 +00:00
