Christopher Ferris
2b80d24d64
Merge "Use the new AndroidUnwinder object." am: f26a9504db am: 816f2dac18
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2029024
Change-Id: Idf9fefe66f5587ea99e11b9dbbe75acf20d2bdfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 22:22:25 +00:00
Jaegeuk Kim
e6a752470b
Merge "logwrap_fork_execvp block recovery auto reboot" am: 85d86d0e85 am: 676a3b878f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2089483
Change-Id: Iaf2a6c1faffae6fd9f0ae3384f3e732e74497cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 22:22:17 +00:00
Pete Bentley
e81d47f9cd
[automerger skipped] Remove setenvs when running boringssl_self_test. am: 8a9b9820e5 -s ours
...
am skip reason: Merged-In I8ce57619aa4d1e6457f3f864bf5e403f727c040c with SHA-1 ba830eb81b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/18375393
Change-Id: I8b152bda56aa2825ff1a09989b416e7ad620d9f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 21:59:31 +00:00
Christopher Ferris
816f2dac18
Merge "Use the new AndroidUnwinder object." am: f26a9504db
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2029024
Change-Id: If90098d093664581831222bd0644f1412299bded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 21:53:33 +00:00
Jaegeuk Kim
676a3b878f
Merge "logwrap_fork_execvp block recovery auto reboot" am: 85d86d0e85
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2089483
Change-Id: I9278f1b6ab139358c9be8e728e35d3990c5493fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 21:53:23 +00:00
Eric Biggers
5aacd5b536
Merge "Annotate and consolidate use of encryption=None" am: 47742ecc54 am: b6fcba892b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2093957
Change-Id: Icde6e5f76ea5dbe74ef8ac2828e2d5a1760a11c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 21:37:02 +00:00
Christopher Ferris
f26a9504db
Merge "Use the new AndroidUnwinder object."
2022-05-13 21:14:16 +00:00
Jaegeuk Kim
85d86d0e85
Merge "logwrap_fork_execvp block recovery auto reboot"
2022-05-13 21:08:39 +00:00
Eric Biggers
b6fcba892b
Merge "Annotate and consolidate use of encryption=None" am: 47742ecc54
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2093957
Change-Id: I8a8213e483ef8e2d4ca71ea67527be4f211a7c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 20:58:37 +00:00
Treehugger Robot
0eb564b008
Merge "img2simg: Add support for converting holes to "don't care" chunks" am: 79677f8b49 am: 19e2b6a558
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935420
Change-Id: I75664f6e1330377ae693a8da951d9586d7f189a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 20:41:47 +00:00
Eric Biggers
47742ecc54
Merge "Annotate and consolidate use of encryption=None"
2022-05-13 20:24:08 +00:00
Treehugger Robot
19e2b6a558
Merge "img2simg: Add support for converting holes to "don't care" chunks" am: 79677f8b49
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935420
Change-Id: Iae2718ab351da24ec6b2cb36a227b321811f0644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 19:50:50 +00:00
Treehugger Robot
79677f8b49
Merge "img2simg: Add support for converting holes to "don't care" chunks"
2022-05-13 19:07:36 +00:00
liyong
ed88361e6c
logwrap_fork_execvp block recovery auto reboot
...
Bug:231647359
Test:call ensure_path_mounted("/data") in WipeData function in recovery then factory reset
Change-Id: Ia5b669319776fae9478534484e3993c15fe4e6bf
2022-05-13 11:15:11 -07:00
Eric Biggers
72c781df26
Annotate and consolidate use of encryption=None
...
Although metadata encryption makes the device encryption policy
redundant, for now it is still being used, and the rule is still that
every top-level directory in /data is encrypted by the device policy
unless there is a specific reason why the directory can't be encrypted.
There are various cases where encryption=None is legimately needed and
is used, but they aren't explained in the code, and the option is prone
to be copy-and-pasted (as was done in https://r.android.com/1932960 ).
Fix this by explicitly commenting every case where encryption=None is
used, and consolidating the creation of all the user parent directories
into one place. (I left /data/bootanim as-is since it will be changed
to encrypted; see b/232299581.)
Change-Id: I6db5f4be7774e3d250c370638e8e7e33e226f3e7
2022-05-13 17:48:51 +00:00
Pete Bentley
8a9b9820e5
Remove setenvs when running boringssl_self_test.
...
No longer needed as the code to generate flag files based on
this environment variable is removed in Android 13.
Bug: 231946889
Test: Build and boot,
Change-Id: I8ce57619aa4d1e6457f3f864bf5e403f727c040c
(cherry picked from commit ba830eb81b )
Merged-In: I8ce57619aa4d1e6457f3f864bf5e403f727c040c
2022-05-13 17:42:53 +01:00
Jooyung Han
4a8d564a5e
Merge changes from topics "action-in-apex-config", "apex-ready-event", "subcontext-for-vendor-apex" am: ec76b5cb4e am: 364bc73186
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2093006
Change-Id: I3f9f6446af71094526e3c5a2ff2034ba25495c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 03:55:45 +00:00
Jooyung Han
c2d6134c2b
add apex-ready event after post-fs-data am: 1eb3394e9c am: 72a7532648
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2093005
Change-Id: I59dc322c0c3d22daa3870edc147046704b8b3f8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 03:55:41 +00:00
Jooyung Han
03baf470dc
APEX configs support 'on' as well am: badb7de1a2 am: bc3ec37dad
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2093004
Change-Id: I6b656e0e9de265f1532406236d38578e2a99cf7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 03:55:36 +00:00
Jooyung Han
364bc73186
Merge changes from topics "action-in-apex-config", "apex-ready-event", "subcontext-for-vendor-apex" am: ec76b5cb4e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2093006
Change-Id: I6a5af004ea93fa333138f38cdb7c859c445cfa0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 03:13:16 +00:00
Jooyung Han
72a7532648
add apex-ready event after post-fs-data am: 1eb3394e9c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2093005
Change-Id: I57b58e139a1cf3f01de3cb8eea4379a5395bae61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 03:13:11 +00:00
Jooyung Han
bc3ec37dad
APEX configs support 'on' as well am: badb7de1a2
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2093004
Change-Id: Iab5bc7325e65c464d42e775d724e7e834671081a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 03:13:09 +00:00
Jooyung Han
ec76b5cb4e
Merge changes from topics "action-in-apex-config", "apex-ready-event", "subcontext-for-vendor-apex"
...
* changes:
Use subcontext for APEX configs from /{vendor, odm}
add apex-ready event after post-fs-data
APEX configs support 'on' as well
2022-05-13 01:47:40 +00:00
William Escande
4e1e3e5575
Set the aptx as provided by system am: e41474eae5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/18337263
Change-Id: I227f48349cd24f10053d2f0e6f85bf64a525295a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:37:31 +00:00
Christopher Ferris
3b7b7ba90e
Use the new AndroidUnwinder object.
...
This simplifies most of the calls to avoid doing any Android
specific code.
Bug: 120606663
Test: All unit tests pass.
Change-Id: I511e637b9459a1f052a01e501b134e31d65b5fbe
2022-05-12 15:18:46 -07:00
Eric Biggers
0368bbdf6b
Merge "Move creation of /data/user/0 and /data/media/obb to vold" am: 93a8fc215e am: 1cbab9e135
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2095463
Change-Id: I6d28654336561d4b2ff0e114c3100a654124ad6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 19:57:48 +00:00
Eric Biggers
1cbab9e135
Merge "Move creation of /data/user/0 and /data/media/obb to vold" am: 93a8fc215e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2095463
Change-Id: I3677185eeb98ec4258f982edc8a708d512c5052a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 19:38:51 +00:00
Eric Biggers
93a8fc215e
Merge "Move creation of /data/user/0 and /data/media/obb to vold"
2022-05-12 18:41:21 +00:00
Treehugger Robot
1f8ae5a957
Merge "Remove setenvs when running boringssl_self_test." am: c970c8257d am: 4776afbc91
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2096462
Change-Id: I275dd24471c6f884c065518867747858a4b3ddc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 16:19:33 +00:00
Treehugger Robot
4776afbc91
Merge "Remove setenvs when running boringssl_self_test." am: c970c8257d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2096462
Change-Id: I00c4b4eb2f40c62131edc04de33197341f1ec436
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 15:45:30 +00:00
Treehugger Robot
c970c8257d
Merge "Remove setenvs when running boringssl_self_test."
2022-05-12 15:30:22 +00:00
Pete Bentley
ba830eb81b
Remove setenvs when running boringssl_self_test.
...
No longer needed as the code to generate flag files based on
this environment variable is removed in Android 13.
Bug: 231946889
Test: Build and boot,
Change-Id: I8ce57619aa4d1e6457f3f864bf5e403f727c040c
2022-05-12 13:50:37 +01:00
Christopher Ferris
3863195506
Merge "Use new AndroidUnwinder object." am: dbe14f2f73 am: 32cfdb4be7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2095788
Change-Id: I18b4dfda04db0fadf49fa9ce9112e1205c3c21ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:08:43 +00:00
Jooyung Han
1eb3394e9c
add apex-ready event after post-fs-data
...
Since apexd.status=ready is system-only property, we need a similar or
equivalent event or property which non-system APEXes can use to define
'on' trigger actions.
Note that services can be started without its own trigger actions by
setting 'class'. For example, 'hal'-class services are started 'on boot'
automatically.
Bug: 202731768
Test: atest CtsInitTestCases
Test: atest CtsBluetoothTestCases (cuttlefish's bt apex defines
'on' actions in the APEX config)
Change-Id: I6eb62ba8d6e350add2ebafe7da06fcaa57d825ff
2022-05-12 13:37:19 +09:00
Jooyung Han
38e8e74550
Use subcontext for APEX configs from /{vendor, odm}
...
Instead of using config file path, use APEX's preinstalled path to
determine whether to use subcontext or not for APEX configs.
Bug: 232021354
Test: CtsInitTestCases, CtsBluetoothTestCases
Change-Id: Iba603f09602f0bec3113e2be3d15c62055c09e72
2022-05-12 13:37:19 +09:00
Jooyung Han
badb7de1a2
APEX configs support 'on' as well
...
APEX configs have supported only 'service' definitions. For those
services relying on 'on' trigger actions, we had to have separate config
files installed in read-only partitions (e.g. /system/etc/init).
This was suboptimal because even though APEXes are updatable, read-only
partitions are not.
Now, 'on' is supported in APEX configs. Putting 'on' trigger actions
near to service definitions makes APEX more self-contained.
'on' trigger actions loaded from APEX configs are not sticky. So, events
happens before loading APEX configs can't trigger actions. For example,
'post-fs-data' is where APEX configs are loaded for now, so 'on
post-fs-data' in APEX configs can't be triggerd.
Bug: 202731768
Test: atest CtsInitTestCases
Change-Id: I5a01d9c7c57b07955b829d6cc157e7f0c91166f9
2022-05-12 13:37:13 +09:00
William Escande
e41474eae5
Set the aptx as provided by system
...
Aptx and aptx-Hd are both vendor libs in system_ext.
In order to load their dependencies from a compatible environement
Bluetooth need to setup the linker
Fix: 231967310
Test: atest net_test_stack_a2dp_native
Test: Log analyze after bluetooth boot
Tag: #refactor
Ignore-AOSP-First: Apex only on tm and below
Change-Id: I752e65889a42fe3378f51bd0821c2958ed9b5a7d
2022-05-11 21:14:41 -07:00
Christopher Ferris
32cfdb4be7
Merge "Use new AndroidUnwinder object." am: dbe14f2f73
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2095788
Change-Id: Ib7e1125d08abef2fabc887dab9b5c77f5df61d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:03:37 +00:00
Christopher Ferris
dbe14f2f73
Merge "Use new AndroidUnwinder object."
2022-05-12 03:35:34 +00:00
Richard Chang
d5fbaa0e3f
Merge "Remove redundant settings in init.rc for cpu scaling_max_freq" am: a596618d4a am: 3d61a4f696
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2093009
Change-Id: I8181e4c753912547a3887e1a59e8c1b5a614bea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 03:21:25 +00:00
Treehugger Robot
e7da3eb805
Merge "Doc Thread requirement." am: c545516e2c am: 40ce64b6db
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2094349
Change-Id: I95cebb43fcd70803fe0bdece39d57546053264cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 03:21:16 +00:00
Richard Chang
3d61a4f696
Merge "Remove redundant settings in init.rc for cpu scaling_max_freq" am: a596618d4a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2093009
Change-Id: I7ccf75f0298d1bed16f73c93c593b1a31ef571e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 03:19:07 +00:00
Richard Chang
a596618d4a
Merge "Remove redundant settings in init.rc for cpu scaling_max_freq"
2022-05-12 02:48:27 +00:00
Treehugger Robot
40ce64b6db
Merge "Doc Thread requirement." am: c545516e2c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2094349
Change-Id: Id9b4616268e8d75338a567c3eab312a3214426b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 02:39:25 +00:00
Treehugger Robot
c545516e2c
Merge "Doc Thread requirement."
2022-05-12 01:53:32 +00:00
Treehugger Robot
70b6eac6cf
Merge "Make sure all expected actions get run." am: a14a44ca66 am: cd53587016
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2095343
Change-Id: I0fe7ebccd2da40439c68c74344303f86f67bc390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 01:22:41 +00:00
Treehugger Robot
cd53587016
Merge "Make sure all expected actions get run." am: a14a44ca66
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2095343
Change-Id: Ifb2eee3ea60f9683146d352fcae7cc1567603a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 00:55:00 +00:00
Christopher Ferris
39819bbc94
Merge "Use the new AndroidUnwinder object." am: af4db6749a am: ce1c33332c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2095264
Change-Id: Icc76b39136bce395106c070aeb338d4e6922a28e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 00:32:48 +00:00
Richard Chang
88da1e6d3f
Merge "Align file permissions for cpufreq scaling_max_freq node" am: abff801ae6 am: 0c13a36060
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2087025
Change-Id: I06edec9334b394e52490006c6f9dbdab91d5a16f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 00:32:40 +00:00
Treehugger Robot
63c9a6b56c
Merge "Promote HWASan tests to presubmit." am: 2d6ffb27d6 am: fd2996c98c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2093147
Change-Id: I3225d46fb18cfcde190ae7e76ac83a09e12aba5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 00:32:16 +00:00