Victor Hsieh
08c98870b2
Merge "mini-keyctl cleanup: keep local funcitons static" am: e16a253cb0 am: 1dd49e2de4
...
am: f4b10e031a
Change-Id: I91a0c46c31d6c4a1c5c5162e03f759e419c221ab
2019-03-18 15:21:23 -07:00
Victor Hsieh
f4b10e031a
Merge "mini-keyctl cleanup: keep local funcitons static" am: e16a253cb0
...
am: 1dd49e2de4
Change-Id: If8e75f1e8e2010e95612d045a48af9e10b03ea8a
2019-03-18 15:17:08 -07:00
Victor Hsieh
1dd49e2de4
Merge "mini-keyctl cleanup: keep local funcitons static"
...
am: e16a253cb0
Change-Id: I1678657424220d02aa45f0f6428bcb925792e304
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
Mark Salyzyn
b01307d744
Merge "Check if we need to Poll for devices after RegenerateUevents" am: 06e6b8551a am: 25ccd57180
...
am: d5d05a12e2
Change-Id: I8b9ceb0ab13287bad92414e1bc52bc6f7308f73d
2019-03-18 14:48:22 -07:00
Greg Kaiser
446f4655cb
Merge "adb: Fix return value in error case" am: 2925a580e9 am: 73308830a6
...
am: 507be15cf8
Change-Id: I2e8d88291ee2f26fda59607eb64e8d6accf69968
2019-03-18 14:46:27 -07:00
David Anderson
13e3d6bba6
Merge changes I88689889,Ibfd66734 am: e2d977bffd am: 53fabb5a09
...
am: d8987190e7
Change-Id: Ic777a9089faf265a69d44cadbbb4fd2102223295
2019-03-18 14:44:11 -07:00
Mark Salyzyn
d5d05a12e2
Merge "Check if we need to Poll for devices after RegenerateUevents" am: 06e6b8551a
...
am: 25ccd57180
Change-Id: Ie42f56d0d4af3a6b18f0afdd1b4667fcd5bfd97a
2019-03-18 14:24:18 -07:00
Greg Kaiser
507be15cf8
Merge "adb: Fix return value in error case" am: 2925a580e9
...
am: 73308830a6
Change-Id: I7cf13d7e4f5850b99fdd843fbd09e349cfea8bee
2019-03-18 14:22:51 -07:00
David Anderson
d8987190e7
Merge changes I88689889,Ibfd66734 am: e2d977bffd
...
am: 53fabb5a09
Change-Id: Ibeac132b87f8f188be75683a0b3dac2a9d020312
2019-03-18 14:21:25 -07:00
Mark Salyzyn
25ccd57180
Merge "Check if we need to Poll for devices after RegenerateUevents"
...
am: 06e6b8551a
Change-Id: I569e3564d78636b1f79d4c20a161ff1120b94276
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
Change-Id: I6fa794d11212e77650f6ffcfd7ee2e80092a9e0a
2019-03-18 14:01:02 -07:00
David Anderson
53fabb5a09
Merge changes I88689889,Ibfd66734
...
am: e2d977bffd
Change-Id: I01ca951c36aa0c0458296839810eac341b7b0b30
2019-03-18 14:00:01 -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
Janis Danisevskis
35c86cb4fd
Merge "gatekeeperd: fixed potential nullptr deref"
2019-03-18 19:24:59 +00:00
Mark Salyzyn
cdb825e461
Check if we need to Poll for devices after RegenerateUevents
...
If the required_devices_partition_names is cleared, no need to Poll.
Test: manual check boot time, and adb-remount-test.sh
Bug: 128834849
Change-Id: I044ee2752a7f32b084ff6e88b4b586accdfb78f0
2019-03-18 10:29:48 -07:00
Yifan Hong
9d8bfd85a7
Merge changes from topic "libprocessgroup" am: 830f837231 am: 98d4fc0d13
...
am: 87948e1215
Change-Id: Ia329f1ff52f61dfa403731016e8163d2baf74adc
2019-03-18 10:15:52 -07:00
Yifan Hong
87948e1215
Merge changes from topic "libprocessgroup" am: 830f837231
...
am: 98d4fc0d13
Change-Id: I626fd8b82c190cdb85e369414d052a946abb731f
2019-03-18 10:11:08 -07:00
Yifan Hong
98d4fc0d13
Merge changes from topic "libprocessgroup"
...
am: 830f837231
Change-Id: Icb325b97b2177538a2bcada2cd398f562e8f7da1
2019-03-18 10:06:09 -07:00
Yifan Hong
830f837231
Merge changes from topic "libprocessgroup"
...
* changes:
libprocessgroup: Add VTS tests for vendor JSON files
libprocessgroup_proto_test split into multiple files
2019-03-18 16:53:47 +00:00
Victor Hsieh
582c7b9b82
mini-keyctl cleanup: keep local funcitons static
...
Test: build
Bug: None
Change-Id: If58f496173d8afff9eb81ff7f5975ddaac765d18
2019-03-18 09:45:12 -07:00
Victor Hsieh
eb0afe8a44
Merge "mini-keyctl: support printing security label" am: 9555bd40ce am: 67111febbe
...
am: 182cb36026
Change-Id: I640a2aaa4f735bd6c423704d2fc1dd027e3d57e1
2019-03-18 09:18:10 -07:00
Victor Hsieh
182cb36026
Merge "mini-keyctl: support printing security label" am: 9555bd40ce
...
am: 67111febbe
Change-Id: I3bb4f2f28d6527070c986720d183dc0fa1571052
2019-03-18 09:14:56 -07:00
Victor Hsieh
67111febbe
Merge "mini-keyctl: support printing security label"
...
am: 9555bd40ce
Change-Id: Ia9d3afcc37c5b0b66f4214aad8acd1c8f1792070
2019-03-18 09:09:48 -07:00
Treehugger Robot
9555bd40ce
Merge "mini-keyctl: support printing security label"
2019-03-18 15:52:28 +00:00
Greg Kaiser
5fe40a66b2
adb: Fix return value in error case
...
When we introduced __adb_check_server_version() as a function
returning a 'bool', we missed missed converting once instance
of "return -1;" to "return false;". Thus, we're returning 'true'
in this case as our non-zero value gets implicitly converted to
'true'.
We fix this case as well with this CL.
Test: TreeHugger
Change-Id: I90b01567d927f36d2d963561b676b3bfabfcee49
2019-03-18 07:00:00 -07:00
Dongwon Kang
aca2e799ee
Merge "List stable libraries media apex relies on." am: fc0f79f8a8 am: 5698f77f5f
...
am: cd557657bc
Change-Id: Ib6b863c7b07f587c2a1d54e1c686d03b75c527ac
2019-03-15 22:47:37 -07:00
Dongwon Kang
cd557657bc
Merge "List stable libraries media apex relies on." am: fc0f79f8a8
...
am: 5698f77f5f
Change-Id: Ia7aa41c791b25417b8929b32c82c8de55920936d
2019-03-15 22:43:31 -07:00
Dongwon Kang
5698f77f5f
Merge "List stable libraries media apex relies on."
...
am: fc0f79f8a8
Change-Id: I5acb7f6e867c40b929446d99d81c601837a1b5ac
2019-03-15 22:39:18 -07:00
Dongwon Kang
fc0f79f8a8
Merge "List stable libraries media apex relies on."
2019-03-16 05:34:09 +00:00
Josh Gao
8738462218
Merge "adb: avoid sign extension of shell return code." am: b5ac15a936 am: a6397564b6
...
am: 3811ab5afa
Change-Id: I334ee2c20a76a6a081b7b752d8e7ca558da3f1da
2019-03-15 21:22:52 -07:00
Josh Gao
3811ab5afa
Merge "adb: avoid sign extension of shell return code." am: b5ac15a936
...
am: a6397564b6
Change-Id: I6d5e70872105ef569d7a2d2b1fbb488c66adfbbe
2019-03-15 21:18:43 -07:00
Josh Gao
a6397564b6
Merge "adb: avoid sign extension of shell return code."
...
am: b5ac15a936
Change-Id: Ib4018e339435eb8a4c79070c1096f076996d0386
2019-03-15 21:14:34 -07:00
Treehugger Robot
b5ac15a936
Merge "adb: avoid sign extension of shell return code."
2019-03-16 04:07:20 +00:00
Andreas Gampe
514fc03638
Merge "Init: Load fsverity keys earlier" am: f09ef56056 am: a0cc42381c
...
am: a7597deed2
Change-Id: Ibe40afdbed4af22f207600a94307448191287f29
2019-03-15 19:34:32 -07:00
Andreas Gampe
a7597deed2
Merge "Init: Load fsverity keys earlier" am: f09ef56056
...
am: a0cc42381c
Change-Id: I3d94308e9cf428fc1306b927bfd700c87943dbc0
2019-03-15 19:24:30 -07:00
Andreas Gampe
a0cc42381c
Merge "Init: Load fsverity keys earlier"
...
am: f09ef56056
Change-Id: Id4fa13d970a379d449376be56a37eae1ac1f118b
2019-03-15 19:19:33 -07:00
Treehugger Robot
f09ef56056
Merge "Init: Load fsverity keys earlier"
2019-03-16 02:05:33 +00:00
Mark Salyzyn
dc36fb1478
Merge "init: add MountHandler property handler" am: f2dadd019d am: 7c55e2a88d
...
am: 38e2b8e9fc
Change-Id: Ifde0446488dc5282ebd01688e1471cb829a4df71
2019-03-15 18:33:47 -07:00
Mark Salyzyn
38e2b8e9fc
Merge "init: add MountHandler property handler" am: f2dadd019d
...
am: 7c55e2a88d
Change-Id: Ie1ef2e623ce39124bfd65c0812e26657b98daa2a
2019-03-15 18:29:38 -07:00
Mark Salyzyn
7c55e2a88d
Merge "init: add MountHandler property handler"
...
am: f2dadd019d
Change-Id: I4bcff7b7fa81b357710cb2a6df06ad6b93dccf9f
2019-03-15 18:25:30 -07:00
Treehugger Robot
f2dadd019d
Merge "init: add MountHandler property handler"
2019-03-16 01:15:18 +00:00
Dongwon Kang
a013e3d53d
List stable libraries media apex relies on.
...
With allow_all_shared_libs, the libs under /system/lib may be used
instead of libs included in the apex. This change adds stable libraries
the media apex relies on to prevent this case.
Test: dumpsys media.extractor, atest MediaPlayer2Test
Bug: 127791685
Change-Id: I6a0419e6da9e9f48a394257b1e8f977ec2dfa9a1
2019-03-15 17:23:03 -07:00
Yifan Hong
e8e2756f93
libprocessgroup: Add VTS tests for vendor JSON files
...
Test: vts_processgroup_validate_test
Bug: 123664216
Change-Id: I5518e34cde6fc30195fc99133f86cb23ae3be92f
2019-03-15 16:28:42 -07:00
Josh Gao
bcde100b00
Merge "adb: attempt to exec newer adb servers on Linux." am: eecd5cc532 am: e60f681f7c
...
am: b333e684d1
Change-Id: I23041966e50fd61dc0e034a609e2534d1f58c1ad
2019-03-15 16:06:29 -07:00
Victor Hsieh
327037f063
mini-keyctl: support printing security label
...
Test: mini-keyctl security <key_id>
Bug: 128607724
Change-Id: If92b41d0aa96d626933546391b964ca2a8a48703
2019-03-15 16:01:01 -07:00
Josh Gao
b333e684d1
Merge "adb: attempt to exec newer adb servers on Linux." am: eecd5cc532
...
am: e60f681f7c
Change-Id: I3a968b8e17e612fef7a30a031ca5664a2e6e5462
2019-03-15 15:42:20 -07:00
Josh Gao
e60f681f7c
Merge "adb: attempt to exec newer adb servers on Linux."
...
am: eecd5cc532
Change-Id: Idceeb6dee8a2ecba374657dcb786d2a3960ea84d
2019-03-15 15:35:41 -07:00