Mark Salyzyn
be843115fc
Merge "fs_mgr: overlay: do not allow sub-mounts to be overridden" am: bde9fc1787
...
am: bdd1ce8538
Change-Id: I53eb16e4e61e899dab6e99a05bec9c69b98ec1d9
2019-07-12 12:10:22 -07:00
Mark Salyzyn
bdd1ce8538
Merge "fs_mgr: overlay: do not allow sub-mounts to be overridden"
...
am: bde9fc1787
Change-Id: I115026d227ceb9950020ebc97694d72c1fc04329
2019-07-12 12:00:19 -07:00
Daniel Norman
739447f024
Merge "Checks the interface inheritance hierarchy in init_rc files." am: 4b505fe3a8
...
am: 08c1556641
Change-Id: I03e1cd45e9a8370df71829015903facbed6c9171
2019-07-12 11:41:44 -07:00
Treehugger Robot
bde9fc1787
Merge "fs_mgr: overlay: do not allow sub-mounts to be overridden"
2019-07-12 18:38:39 +00:00
Daniel Norman
08c1556641
Merge "Checks the interface inheritance hierarchy in init_rc files."
...
am: 4b505fe3a8
Change-Id: Ic479fb46d293260589154c6ce0bf844952c8dd26
2019-07-12 11:32:48 -07:00
Tom Cherry
cc9d1e20e8
Merge "init: Write the reason in BCB on "reboot recovery"" am: e7a010de01
...
am: da80b0debc
Change-Id: Iafb8f0493bbfdbc0817d8c2877dab08b03a97739
2019-07-12 11:03:03 -07:00
Daniel Norman
4b505fe3a8
Merge "Checks the interface inheritance hierarchy in init_rc files."
2019-07-12 18:01:46 +00:00
Tom Cherry
da80b0debc
Merge "init: Write the reason in BCB on "reboot recovery""
...
am: e7a010de01
Change-Id: I3c627e207396e754b56a00d6919ef5a8c2b459b7
2019-07-12 10:54:42 -07:00
Mark Salyzyn
30ea453059
Merge "init: powerctl support and propagate longer canonical reboot reasons." am: 5c296a0003
...
am: 3efb204d73
Change-Id: I7f5c94b7c3f9e4a7a6e313b5e87d71a9972aefd7
2019-07-12 10:53:05 -07:00
Mark Salyzyn
3efb204d73
Merge "init: powerctl support and propagate longer canonical reboot reasons."
...
am: 5c296a0003
Change-Id: Ief8ece1dd4dda9315bc3d0b0213c518a1af2f721
2019-07-12 10:42:02 -07:00
Tom Cherry
e7a010de01
Merge "init: Write the reason in BCB on "reboot recovery""
2019-07-12 17:39:32 +00:00
Treehugger Robot
5c296a0003
Merge "init: powerctl support and propagate longer canonical reboot reasons."
2019-07-12 17:37:25 +00:00
Gerry Fan
3f17869556
Merge "Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" into qt-dev
...
am: ff7da227db
Change-Id: I6f6ec4b8472a3017c47d49a910e9ca982cae6eff
2019-07-12 10:24:00 -07:00
Steven Moreland
023a4282e0
Merge "libutils: remove references to unimplemented func" am: 67a0dd4e27
...
am: 4f8a4b095d
Change-Id: I59478690f8c6d78eea7fb9d6accc81f053c7ae5d
2019-07-12 10:20:33 -07:00
Steven Moreland
e482b3a98f
Merge "libadbd_services: remove unused deps" am: a1821e13f3
...
am: 1c9abb85cb
Change-Id: Ia37257bdda219c46b6e2a7dd5b54062cdd1c45cc
2019-07-12 10:19:48 -07:00
Steven Moreland
4f8a4b095d
Merge "libutils: remove references to unimplemented func"
...
am: 67a0dd4e27
Change-Id: I5d7f1e8f3fa31054338973f1c66f2d56fddc1428
2019-07-12 10:11:35 -07:00
Gerry Fan
ff7da227db
Merge "Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" into qt-dev
2019-07-12 17:11:23 +00:00
Steven Moreland
1c9abb85cb
Merge "libadbd_services: remove unused deps"
...
am: a1821e13f3
Change-Id: I8ebee3fde274c70f60b3419c3dc920de51a87213
2019-07-12 10:10:55 -07:00
Steven Moreland
67a0dd4e27
Merge "libutils: remove references to unimplemented func"
2019-07-12 16:48:04 +00:00
Steven Moreland
a1821e13f3
Merge "libadbd_services: remove unused deps"
2019-07-12 16:36:16 +00:00
Gerry Fan
997a2d93d7
Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""
...
This reverts commit 891a011394 .
Reason for revert: Some Test failed, need more investigation
Bug: 136199978
Change-Id: Ibad0dad02a6701447c39ddcc805d44c9e68bdcce
2019-07-12 15:23:12 +00:00
Hung-ying Tyan
3061693f5d
Merge "Revert "rootdir / sdcard : Stop creating /data/media/obb."" into qt-dev
...
am: 346c17bbc9
Change-Id: I1c99ad74d9b1ee7e486183b4c62ec732d2d23114
2019-07-12 02:49:38 -07:00
Hung-ying Tyan
346c17bbc9
Merge "Revert "rootdir / sdcard : Stop creating /data/media/obb."" into qt-dev
2019-07-12 09:27:01 +00:00
Steven Moreland
c0927e64b1
libutils: remove references to unimplemented func
...
printWeakPointer isn't implemented anywhere. This also allows us to
remove a forward declaration of TextOutput.
Bug: N/A
Test: N/A
Change-Id: Ie2debdfda17b7cc1d599c431eaf4c362a591e482
2019-07-11 17:50:52 -07:00
Gerry Fan
891a011394
Revert "rootdir / sdcard : Stop creating /data/media/obb."
...
This reverts commit c6ca823710 .
Reason for revert: Q-GSI on Pie devices would crash kernel.
Bug: 136199978
Change-Id: I16a2cb81a1f21627db0cb00324679a322ba42fe0
2019-07-12 00:16:06 +00:00
Steven Moreland
e0d94b6493
libadbd_services: remove unused deps
...
Bug: 137311188
Test: library still builds
Change-Id: I52e110ddfda073c833e86194eaf7a9502b9181a6
2019-07-11 16:13:10 -07:00
Daniel Norman
3f42a767cd
Checks the interface inheritance hierarchy in init_rc files.
...
Bug: 118016875
Test: Added 'interface' lines to an init_rc file and observed errors
when misspelled or missing entire inheritance hierarchy.
Change-Id: I681420f15539742d8415808b2a0dcbf0bf6faaf1
2019-07-11 14:43:11 -07:00
Steven Moreland
6f2eeabbcc
Merge "Remove binder dependency in init." am: 4280165ae0
...
am: 538b50d9d5
Change-Id: I570719645f98326c76e1943573686e044b48723b
2019-07-11 14:40:12 -07:00
Steven Moreland
538b50d9d5
Merge "Remove binder dependency in init."
...
am: 4280165ae0
Change-Id: I54ee7ce313210ff47c62ad417c96da40a03cbb29
2019-07-11 14:32:21 -07:00
Steven Moreland
4280165ae0
Merge "Remove binder dependency in init."
2019-07-11 20:56:12 +00:00
Sam Protsenko
4d35f2e59c
init: Write the reason in BCB on "reboot recovery"
...
Without this change "adb reboot recovery" leads to normal boot.
Change-Id: I361d0a1f6f6f2c57f3dc80102c21970b462c9b9c
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
2019-07-11 11:25:28 +00:00
Justin Yun
7cc7b64a44
Merge "Rename product_services to system_ext" am: 6da50e319c
...
am: e0b1eb8d65
Change-Id: I3a1cdb36df2789452ce6e00dbfaba792a565c09b
2019-07-11 00:24:07 -07:00
Justin Yun
e0b1eb8d65
Merge "Rename product_services to system_ext"
...
am: 6da50e319c
Change-Id: If9eaecca2382b3ace74ae721e80d51c79bb9b0fb
2019-07-11 00:15:28 -07:00
Xin Li
5099e52608
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: 7c2e6f4e6f -s ours
...
am: 73d8b8a13d -s ours
am skip reason: subject contains skip directive
Change-Id: I83fac4d48f9b14d0b3a07005635c2b42300c1957
2019-07-10 22:45:15 -07:00
Justin Yun
6da50e319c
Merge "Rename product_services to system_ext"
2019-07-11 05:36:23 +00:00
Xin Li
669355e850
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 3fd963ed5e -s ours
...
am: 0a383c73ee -s ours
am skip reason: subject contains skip directive
Change-Id: Ie6999139d5e8c46f94d13b294c1a0348765ba575
2019-07-10 22:18:01 -07:00
Xin Li
73d8b8a13d
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
...
am: 7c2e6f4e6f -s ours
am skip reason: subject contains skip directive
Change-Id: I735db5e09c5aa3a4eb99b0a995901225aecee974
2019-07-10 21:48:44 -07:00
Xin Li
0a383c73ee
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
am: 3fd963ed5e -s ours
am skip reason: subject contains skip directive
Change-Id: I80f36310a9716bce77e85ab5f0e13e8c7530e970
2019-07-10 21:22:44 -07:00
Treehugger Robot
7c2e6f4e6f
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
2019-07-11 03:52:57 +00:00
Mark Salyzyn
8cf2103083
fs_mgr: overlay: do not allow sub-mounts to be overridden
...
Prevent sub-mounts from being candidates for overlayfs overrides.
We move them temporarily to hold the references, then move them back
after overlayfs mount.
There is a race condition that can not be solved where the content
of the sub-mount is temporarily unavailable. This operation occurs
in first stage init (no problem) and during the first adb remount or
adb disable-verity that causes the backing storage to be setup.
Workaround will be to time the adb remount/disable-verity so that the
device-specific problems do not surface.
Test: adb-remount-test.sh and manual device configs
Bug: 130131892
Bug: 135647457
Change-Id: I8782d09b7b389d899aed07b3e6c528280af2d6c8
2019-07-10 14:32:05 -07:00
Mark Salyzyn
d7931f1149
init: powerctl support and propagate longer canonical reboot reasons.
...
init: Received sys.powerctl='reboot,userrequested,recovery,ui' ... (/system/bin/recovery)
init: powerctl: unrecognized command 'reboot,userrequested,recovery,ui'
Test: manual & boot_reason_test.sh
Bug: 63736262
Bug: 135078366
Bug: 133326470
Change-Id: I931daf8dc4b74db5ee114c59ee215b1ba54bc31d
2019-07-10 13:06:57 -07:00
Steven Moreland
4ee27039e0
Remove binder dependency in init.
...
- unused
- using binder requires twoway calls (since getting a service from
servicemanager requires two calls)
Bug: 135768100
Test: N/A
Change-Id: Idc41f487bad2d8343e99ded98812f3a84e2b8e37
2019-07-10 17:01:31 +00:00
Elliott Hughes
f46b1efcbd
Merge "grep is now toybox grep." am: d543c8ca11
...
am: 41d4639318
Change-Id: Ie1367fafd33df1fea7ab3a01a50cab2b0e2febe8
2019-07-10 08:47:19 -07:00
Elliott Hughes
41d4639318
Merge "grep is now toybox grep."
...
am: d543c8ca11
Change-Id: Ie2ace15b034fad308666f0bfabec24cc7a55695c
2019-07-10 08:41:23 -07:00
Elliott Hughes
d543c8ca11
Merge "grep is now toybox grep."
2019-07-10 15:19:58 +00:00
Xin Li
3fd963ed5e
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
Bug: 136196576
Change-Id: I127ae61add2e34184b3c65ca64693cccf62b8a6d
2019-07-09 17:00:47 -07:00
Justin Yun
7eaf9b58ec
Rename product_services to system_ext
...
Update ld.config.txt and init.
Bug: 134359158
Test: make && check boot and ld.config.txt file
Change-Id: Ie1dce42e690414fb45b26759506ea7f64d06740d
2019-07-09 23:34:17 +00:00
Florian Mayer
1051600430
Merge "Fix missing load bias." am: 3f407fcc37
...
am: 186b6bbdd5
Change-Id: I7c2ccd4d5ac96b2f7ae889ed0ffab6ed7327ade0
2019-07-09 15:02:25 -07:00
Florian Mayer
186b6bbdd5
Merge "Fix missing load bias."
...
am: 3f407fcc37
Change-Id: I5986c44d75d35090f093667da4ecfa25725efd27
2019-07-09 14:49:19 -07:00
Florian Mayer
3f407fcc37
Merge "Fix missing load bias."
2019-07-09 21:30:47 +00:00