Commit graph

49216 commits

Author SHA1 Message Date
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
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
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
Andreas Gampe
e8565ac94a Init: Load fsverity keys earlier
Keys may be required for apex updates (post-installs), so load them
before starting apexd.

Bug: 125474642
Test: m
Test: manual
Change-Id: I32ddb6ae6854334e8ee7e195173ecfaed565d783
2019-03-15 15:14:35 -07:00
Josh Gao
1e1ae45a8c adb: avoid sign extension of shell return code.
Windows has int32_t return codes, which results in return codes 128-255
being sign extended into a negative number. Manually truncate the return
codes we get to preserve their values.

Test: test_device.py on windows
Change-Id: If41d6d469350301704f6ecff72ad17b412db3e04
2019-03-15 14:54:32 -07:00
Josh Gao
eecd5cc532 Merge "adb: attempt to exec newer adb servers on Linux." 2019-03-15 21:54:10 +00:00
Mark Salyzyn
a73ed22cb7 init: add MountHandler property handler
Set properties dev.mnt.blk.<mount_point>=<device_block_class> for mount
and umount operations by setting up an Epoll handler to catch
EPOLLERR or EPOLLPRI signals when /proc/mounts is changed.  Only
update properties associated with block devices.  For the mount
point of /, use the designation of /root instead.

Can use the properties in init rc expansion like:

on property dev.mnt.blk.root=*
    write /sys/block/${dev.mnt.blk.root}/queue/read_ahead_kb ${boot_read_ahead_kb:-2048}

on property dev.mnt.blk.data=*
    write /sys/block/${dev.mnt.blk.data}/queue/read_ahead_kb ${boot_read_ahead_kb:-2048}

on late-fs
    setprop boot_read_ahead_kb 128
    write /sys/block/${dev.mnt.blk.root}/queue/read_ahead_kb ${boot_read_ahead_kb}
    write /sys/block/${dev.mnt.blk.data}/queue/read_ahead_kb ${boot_read_ahead_kb}

Test: boot and inspect getprop results.
Bug: 124072565
Change-Id: I1b8aff44f922ba372cd926de2919c215c40ee874
2019-03-15 11:54:38 -07:00
Elliott Hughes
f5bd7e78de Merge "libprocessgroup: PLOG already includes strerror(errno)." am: 0e5b74deff am: 9403b8883c
am: 174678712b

Change-Id: I148b92f82349d984fe264d46a51ba22386710d1b
2019-03-15 08:35:45 -07:00
Elliott Hughes
174678712b Merge "libprocessgroup: PLOG already includes strerror(errno)." am: 0e5b74deff
am: 9403b8883c

Change-Id: I4dc07058658d1816a1026561d9857abf3a5a5155
2019-03-15 08:31:35 -07:00
Elliott Hughes
9403b8883c Merge "libprocessgroup: PLOG already includes strerror(errno)."
am: 0e5b74deff

Change-Id: Iedbb582e7d917e772bc0ddacb725733059120292
2019-03-15 08:27:26 -07:00
Elliott Hughes
0e5b74deff Merge "libprocessgroup: PLOG already includes strerror(errno)." 2019-03-15 15:19:22 +00:00
Jiyong Park
e681121c52 Merge changes from topic "apex_earlymount_no_bionic_bindmount" am: 4cd0914048 am: a4015c04df
am: 943edd90ff

Change-Id: Icc6c8fa31a7bbaced91166535d200e8c0e2de713
2019-03-15 02:44:29 -07:00
Jiyong Park
c9a07bcbb4 Revert "Handle adb sync with Bionic under /bionic" am: fc97d2a116 am: 8b9fa0a44d
am: ebe1460df5

Change-Id: I24a5a49a8cd894b93664c65b76534db614d891e2
2019-03-15 02:43:37 -07:00
Jiyong Park
190cee3519 Don't bind-mount bionic files am: 7b4801a921 am: 2f2b99a20d
am: f90d8479c9

Change-Id: I06ceb206ce8b95176fa7a74802d2d0b7d34f444c
2019-03-15 02:42:54 -07:00
Jiyong Park
943edd90ff Merge changes from topic "apex_earlymount_no_bionic_bindmount" am: 4cd0914048
am: a4015c04df

Change-Id: Ice90f6c9a2579575a667d9552d59ea6e8fdd2a39
2019-03-15 02:31:26 -07:00
Jiyong Park
ebe1460df5 Revert "Handle adb sync with Bionic under /bionic" am: fc97d2a116
am: 8b9fa0a44d

Change-Id: Ic582b6217d99200105ef67e096bfe15411609811
2019-03-15 02:30:44 -07:00
Jiyong Park
f90d8479c9 Don't bind-mount bionic files am: 7b4801a921
am: 2f2b99a20d

Change-Id: I060cec73225f039b23c4c1170bf8a7769a7c1ac6
2019-03-15 02:30:10 -07:00
Jiyong Park
a4015c04df Merge changes from topic "apex_earlymount_no_bionic_bindmount"
am: 4cd0914048

Change-Id: If31c1ac798d3aacd2a2aaa1f1c6e0695e3952a82
2019-03-15 02:19:35 -07:00
Jiyong Park
8b9fa0a44d Revert "Handle adb sync with Bionic under /bionic"
am: fc97d2a116

Change-Id: I8c8780f0009795d281b93efa691791427402ef45
2019-03-15 02:18:42 -07:00
Jiyong Park
2f2b99a20d Don't bind-mount bionic files
am: 7b4801a921

Change-Id: I80ded3b5efbee209eb705556bc92e2708497da20
2019-03-15 02:17:48 -07:00
Treehugger Robot
4cd0914048 Merge changes from topic "apex_earlymount_no_bionic_bindmount"
* changes:
  /bionic path is gone
  Revert "Handle adb sync with Bionic under /bionic"
  Don't bind-mount bionic files
2019-03-15 09:02:18 +00:00
Bowgo Tsai
76f9dc6f31 Merge changes from topic "adb_root_in_user" am: da1251d6a5 am: ac5d9460f2
am: c613c0d130

Change-Id: I46e9d64a103c7a983d908e7b6f131332aafe1b72
2019-03-14 22:05:05 -07:00
Bowgo Tsai
c613c0d130 Merge changes from topic "adb_root_in_user" am: da1251d6a5
am: ac5d9460f2

Change-Id: I5a71508fe02bfb4fc182b2e2501a9d6bf39eba97
2019-03-14 22:00:55 -07:00
Bowgo Tsai
ac5d9460f2 Merge changes from topic "adb_root_in_user"
am: da1251d6a5

Change-Id: Ia9959008ac5cc571efe46bd0b80cbae53356d5ed
2019-03-14 21:55:02 -07:00
Treehugger Robot
da1251d6a5 Merge changes from topic "adb_root_in_user"
* changes:
  Allow overriding ro.debuggable to 1 on USER builds
  adbd: allowing adb root when the device is unlocked
2019-03-15 04:40:43 +00:00
Elliott Hughes
08b4d32139 libprocessgroup: PLOG already includes strerror(errno).
Test: builds
Change-Id: Ic1fe6b46144f7dbeb7ffba5534d94b4dae192d5c
2019-03-14 20:06:36 -07:00
Josh Gao
d10b7c4e02 adb: attempt to exec newer adb servers on Linux.
Test: manual
Change-Id: Iebdfa292f21b2871e6010ab6cc964134fec447e9
2019-03-14 15:41:41 -07:00
Bowgo Tsai
1dacd42ae1 Allow overriding ro.debuggable to 1 on USER builds
When init found "/force_debuggable" in the first-stage ramdisk, it will
do the following if the device is unlocked:
  1. load /system/etc/adb_debug.prop (with ro.debuggable=1)
  2 .load userdebug_plat_sepolicy.cil instead of original plat_sepolicy.cil from
    /system/etc/selinux/.

This make it possible to run VTS on a USER build GSI, by using a special
ramdisk containing "/force_debuggable".

Bug: 126493225
Test: unlock a USER build device, check 'adb root' can work
Change-Id: I9b4317bac1ce92f2c0baa67c83d4b12deba62c92
2019-03-15 06:12:00 +08:00