Commit graph

65988 commits

Author SHA1 Message Date
Josh Gao
af622ddb85 Merge "[adb] Fix crash in mdns service removal." am: 7229923bcd am: d6fcfc8099 am: 8c2fc237f7 am: dd3470470d am: 1fd7f0c606
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1352926

Change-Id: Ie1bf5abc375a7baa48d69c4b1927b3d6a019866c
2020-07-06 21:54:45 +00:00
Yifan Hong
c10cf3806f Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev am: 2ce3ddfee1 am: f8febaaf6d am: 9807df3669 am: 46e07d3950
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12087943

Change-Id: I82f0970bce4cc9e4ec46c6ebb32893d67e826d24
2020-07-06 21:54:38 +00:00
Automerger Merge Worker
9f26204398 Merge "Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev am: 2ce3ddfee1 am: 91033bdb76 am: 60238ac7c0" into rvc-qpr-dev-plus-aosp am: f9cc760fb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12087943

Change-Id: I0b2cde4912a5656049dbe71f0153717cc751251b
2020-07-06 21:54:26 +00:00
Yifan Hong
8045decfc5 Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev am: 2ce3ddfee1 am: 91033bdb76 am: d393657b85 am: 8e003772f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12087943

Change-Id: I75e94fef87b579c7b131e7b25d3fc0a0a5c660e3
2020-07-06 21:53:34 +00:00
Josh Gao
1fd7f0c606 Merge "[adb] Fix crash in mdns service removal." am: 7229923bcd am: d6fcfc8099 am: 8c2fc237f7 am: dd3470470d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1352926

Change-Id: Id6cf9949fd0c01fd4b2b985038d3d0c0fc2c0357
2020-07-06 21:41:09 +00:00
Yifan Hong
46e07d3950 Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev am: 2ce3ddfee1 am: f8febaaf6d am: 9807df3669
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12087943

Change-Id: I7fc65670c66b2af2a1ef12553502ff81ec407b40
2020-07-06 21:40:56 +00:00
Automerger Merge Worker
f9cc760fb6 Merge "Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev am: 2ce3ddfee1 am: 91033bdb76 am: 60238ac7c0" into rvc-qpr-dev-plus-aosp 2020-07-06 21:40:02 +00:00
Yifan Hong
598e432668 Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev am: 2ce3ddfee1 am: 91033bdb76 am: 60238ac7c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12087943

Change-Id: Ib3d29cd72e231bf31485032184ab5a283a7c4470
2020-07-06 21:39:54 +00:00
Yifan Hong
8e003772f0 Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev am: 2ce3ddfee1 am: 91033bdb76 am: d393657b85
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12087943

Change-Id: Ie1ebc0ae79a9c5befa8213dbb90a061074c7bce8
2020-07-06 21:39:45 +00:00
Josh Gao
dd3470470d Merge "[adb] Fix crash in mdns service removal." am: 7229923bcd am: d6fcfc8099 am: 8c2fc237f7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1352926

Change-Id: I0e0d61068d3e27353671d7066215178ebc78d2c0
2020-07-06 20:47:16 +00:00
Yifan Hong
d393657b85 Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev am: 2ce3ddfee1 am: 91033bdb76
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12087943

Change-Id: I77cb3fc13680a2abd10b9cf73b5456eba826c38c
2020-07-06 20:47:11 +00:00
Yifan Hong
9807df3669 Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev am: 2ce3ddfee1 am: f8febaaf6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12087943

Change-Id: I2a02a56002f18fbbdf5aacb5562d1472981320cc
2020-07-06 20:47:04 +00:00
Yifan Hong
60238ac7c0 Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev am: 2ce3ddfee1 am: 91033bdb76
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12087943

Change-Id: I56e7ca8df21c263a891ab8d619b6bfa2b5fe691b
2020-07-06 20:46:42 +00:00
Josh Gao
8c2fc237f7 Merge "[adb] Fix crash in mdns service removal." am: 7229923bcd am: d6fcfc8099
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1352926

Change-Id: Id4c47e039124a66231b7db534b4fb02e9de212fe
2020-07-06 20:42:24 +00:00
Yifan Hong
f8febaaf6d Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev am: 2ce3ddfee1
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12087943

Change-Id: I8d99825dcfb21b7acf78aac610dac4c922e39032
2020-07-06 20:33:18 +00:00
Yifan Hong
91033bdb76 Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev am: 2ce3ddfee1
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12087943

Change-Id: I3b3db23e9ab8e4195a47fe68800fdce9e40b769c
2020-07-06 20:32:51 +00:00
Josh Gao
d6fcfc8099 Merge "[adb] Fix crash in mdns service removal." am: 7229923bcd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1352926

Change-Id: Ic92ae62b4ddfc47b7bb85227b841558e8330bd67
2020-07-06 20:24:44 +00:00
Yifan Hong
2ce3ddfee1 Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev 2020-07-06 20:24:02 +00:00
Josh Gao
7229923bcd Merge "[adb] Fix crash in mdns service removal." 2020-07-06 20:14:27 +00:00
Yifan Hong
ba5dfd76de liblp: Force 10.0 metadata on downgrade to Q.
Q liblp only supports 10.0 super partition metadata, so
forcefully downgrade the current metadata version too.

On retrofit Virtual A/B devices, the metadata version is
at most 10.1, because the new VIRTUAL_AB flag is not set
on retrofit devices.

In version 10.1, two per-partition flags: UPDATED and DISABLED
are introduced.
- The updated flag is set when the device undergoes a Virtual A/B
update before. Clear it.
- The disabled flag should only be set on metadata files used by
libfiemap ImageManager. It shouldn't be used on super partition metadata.

Hence, this CL should only clear UPDATED flag.

Test: R->R->Q OTA
Bug: 159590481
Change-Id: I8b548c8ce36a75197e7172a77f9207fd44fe4670
2020-07-06 10:06:36 -07:00
Jim Kaye
836946a1bf Merge "Add Silent Mode boot controls" am: 08097d4ba4 am: a283bf1bdb am: e08957e317 am: 3db56d246e am: 9752b42864
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1353985

Change-Id: I3c5d520f3c23603eab90214bb77a24c4a3597f07
2020-07-03 19:13:15 +00:00
Jim Kaye
9752b42864 Merge "Add Silent Mode boot controls" am: 08097d4ba4 am: a283bf1bdb am: e08957e317 am: 3db56d246e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1353985

Change-Id: Id9a5ea3f1e554058b9c0a14e124a6a880feb2e79
2020-07-03 19:00:53 +00:00
Jim Kaye
3db56d246e Merge "Add Silent Mode boot controls" am: 08097d4ba4 am: a283bf1bdb am: e08957e317
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1353985

Change-Id: I4c1842bca272f73454c3244acae35b5ef950aa6c
2020-07-03 18:43:51 +00:00
Jim Kaye
e08957e317 Merge "Add Silent Mode boot controls" am: 08097d4ba4 am: a283bf1bdb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1353985

Change-Id: I4a841d0a650849fd7bbf9aeedd000324fb14ee8c
2020-07-03 18:34:13 +00:00
Jim Kaye
a283bf1bdb Merge "Add Silent Mode boot controls" am: 08097d4ba4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1353985

Change-Id: I924c026070bdf2a5458af6594fba1dd36aad5da3
2020-07-03 18:24:20 +00:00
Jim Kaye
08097d4ba4 Merge "Add Silent Mode boot controls" 2020-07-03 18:12:18 +00:00
Treehugger Robot
c0a69cbba0 Merge "Remove SkipMountingPartitions from vendor libfstab" am: 437ded4dbd am: 52feb83b51 am: 2268730110 am: b5086b62a8 am: c46a76134c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1354545

Change-Id: Iba39d1afa5e230ccf13505c80c0b39699d2cc802
2020-07-03 13:15:09 +00:00
Treehugger Robot
c46a76134c Merge "Remove SkipMountingPartitions from vendor libfstab" am: 437ded4dbd am: 52feb83b51 am: 2268730110 am: b5086b62a8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1354545

Change-Id: I63fbc11c089adf3292f68026a18437503e8c7f40
2020-07-03 13:02:03 +00:00
Treehugger Robot
b5086b62a8 Merge "Remove SkipMountingPartitions from vendor libfstab" am: 437ded4dbd am: 52feb83b51 am: 2268730110
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1354545

Change-Id: I71be4d31556c6878c76c17762ad8e0fa2a06201b
2020-07-03 12:49:04 +00:00
Treehugger Robot
2268730110 Merge "Remove SkipMountingPartitions from vendor libfstab" am: 437ded4dbd am: 52feb83b51
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1354545

Change-Id: I178d7c82081df54eba8d7fd48db63e69b467cd90
2020-07-03 12:32:59 +00:00
Treehugger Robot
52feb83b51 Merge "Remove SkipMountingPartitions from vendor libfstab" am: 437ded4dbd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1354545

Change-Id: I1c8983d21d3c63566dd6f22a6268bff97f86eaa0
2020-07-03 12:14:27 +00:00
Treehugger Robot
437ded4dbd Merge "Remove SkipMountingPartitions from vendor libfstab" 2020-07-03 12:02:55 +00:00
Hung-ying Tyan
e7cb09d226 Remove SkipMountingPartitions from vendor libfstab
SkipMountingPartitions() should only be called from a system process
as the config file is in /system_ext.
Remove it from the vendor variant of libfstab.

Bug: 158301941
Test: build hardware/interfaces/boot/1.1/default/boot_control and check symbol
Change-Id: I834183a623c0711dd79b89486fc3fc80f9710801
2020-07-03 17:16:21 +08:00
Boleyn Su
be96fc73d0 [automerger skipped] ReadFileSymbolicLink checks /system/bin/ps am: 9285b496bd -s ours am: aa1e5a749a -s ours am: dbc565b1ed -s ours am: b8b55d0795 -s ours
am skip reason: Change-Id I0d3f96c1656dfe02bfa0e801680f7fa887afd1d9 with SHA-1 c068d0e0ef is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12066063

Change-Id: I66a01e17e2aa1ad59899d6e7d212748e8d09b036
2020-07-02 19:47:49 +00:00
Boleyn Su
3a8f24a6df [automerger skipped] ReadFileSymbolicLink checks /system/bin/ps am: 9285b496bd am: 7f5d723ead -s ours am: ac692bf71d -s ours am: 0bb11e3155 -s ours
am skip reason: Change-Id I0d3f96c1656dfe02bfa0e801680f7fa887afd1d9 with SHA-1 c068d0e0ef is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12066063

Change-Id: Id33d21a8c4294d231a4bbab114d999aa3f0bc2ec
2020-07-02 19:47:42 +00:00
Boleyn Su
2fa216fcfa [automerger skipped] ReadFileSymbolicLink checks /system/bin/ps am: 9285b496bd am: 7f5d723ead am: 419f1c5bbe -s ours am: 8be9b60836 -s ours
am skip reason: Change-Id I0d3f96c1656dfe02bfa0e801680f7fa887afd1d9 with SHA-1 c068d0e0ef is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12066063

Change-Id: I7290eb840615b9ae9c3fb4c8bae313f46d075773
2020-07-02 19:46:44 +00:00
Boleyn Su
b8b55d0795 [automerger skipped] ReadFileSymbolicLink checks /system/bin/ps am: 9285b496bd -s ours am: aa1e5a749a -s ours am: dbc565b1ed -s ours
am skip reason: Change-Id I0d3f96c1656dfe02bfa0e801680f7fa887afd1d9 with SHA-1 c068d0e0ef is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12066063

Change-Id: I20b503108f09643fcd2d1df3107dfdf4a1fbbb25
2020-07-02 19:34:12 +00:00
Boleyn Su
0bb11e3155 [automerger skipped] ReadFileSymbolicLink checks /system/bin/ps am: 9285b496bd am: 7f5d723ead -s ours am: ac692bf71d -s ours
am skip reason: Change-Id I0d3f96c1656dfe02bfa0e801680f7fa887afd1d9 with SHA-1 c068d0e0ef is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12066063

Change-Id: I89329f7772f5dcbd155cd97fe01f413ea3135404
2020-07-02 19:33:54 +00:00
Boleyn Su
8be9b60836 [automerger skipped] ReadFileSymbolicLink checks /system/bin/ps am: 9285b496bd am: 7f5d723ead am: 419f1c5bbe -s ours
am skip reason: Change-Id I0d3f96c1656dfe02bfa0e801680f7fa887afd1d9 with SHA-1 c068d0e0ef is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12066063

Change-Id: I55545085616f31bbb4cea76a12de7b377ded1ef3
2020-07-02 19:33:41 +00:00
Boleyn Su
dbc565b1ed [automerger skipped] ReadFileSymbolicLink checks /system/bin/ps am: 9285b496bd -s ours am: aa1e5a749a -s ours
am skip reason: Change-Id I0d3f96c1656dfe02bfa0e801680f7fa887afd1d9 with SHA-1 c068d0e0ef is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12066063

Change-Id: I71290749f8b395a144e064b4fad56b0ab79df9aa
2020-07-02 19:20:46 +00:00
Boleyn Su
419f1c5bbe ReadFileSymbolicLink checks /system/bin/ps am: 9285b496bd am: 7f5d723ead
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12066063

Change-Id: I84234b1f19c8ce491261689773630095c2605b85
2020-07-02 19:20:37 +00:00
Boleyn Su
ac692bf71d [automerger skipped] ReadFileSymbolicLink checks /system/bin/ps am: 9285b496bd am: 7f5d723ead -s ours
am skip reason: Change-Id I0d3f96c1656dfe02bfa0e801680f7fa887afd1d9 with SHA-1 c068d0e0ef is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12066063

Change-Id: Iec58d5fb5b52fc5431aa48e924b66f2e28d7f626
2020-07-02 19:20:26 +00:00
Boleyn Su
aa1e5a749a [automerger skipped] ReadFileSymbolicLink checks /system/bin/ps am: 9285b496bd -s ours
am skip reason: Change-Id I0d3f96c1656dfe02bfa0e801680f7fa887afd1d9 with SHA-1 c068d0e0ef is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12066063

Change-Id: I6124b4e1fead1415e0dd2940895659e39da84e6c
2020-07-02 19:12:28 +00:00
Boleyn Su
7f5d723ead ReadFileSymbolicLink checks /system/bin/ps am: 9285b496bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12066063

Change-Id: I8937703c1bade83ca382acdc6f9dc09fff8c4100
2020-07-02 19:12:23 +00:00
Boleyn Su
9285b496bd ReadFileSymbolicLink checks /system/bin/ps
According to
https://android.googlesource.com/platform/build/+/refs/heads/android10-dev/core/Makefile#140,
/default.prop may not be a symbolic link.

Bug: 158552949
Test: atest CtsInitTestCases

Change-Id: I19bde577fa50280e1ed6fb8fdbe846655abb930b
Merged-In: I0d3f96c1656dfe02bfa0e801680f7fa887afd1d9
(cherry picked from commit 6f47feaccdbe849c982e0de9068e38be85006bfb)
(cherry picked from commit 755a3dd78d)
2020-07-02 04:22:10 +00:00
Suren Baghdasaryan
4bbfa1764f [automerger skipped] libprocessgroup: Allow vendor profile attributes to override system ones am: d4bc3f2adb -s ours am: eae512f303 -s ours am: f93333790f -s ours am: 42b6fdc340 -s ours
am skip reason: Change-Id I71a2ee4d4b3c585e7c9a01b791e973390d409cbc with SHA-1 d4bc3f2adb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12062649

Change-Id: Iaf88ae3d37f4bc3fb79d2002374da6bb9fb53d61
2020-07-02 01:34:58 +00:00
Automerger Merge Worker
57f464683b Merge "[automerger skipped] libprocessgroup: Allow vendor profile attributes to override system ones am: d4bc3f2adb am: ca6012a07d am: 93082029a1 -s ours" into rvc-qpr-dev-plus-aosp am: ffea2bfce3 -s ours
am skip reason: Change-Id I71a2ee4d4b3c585e7c9a01b791e973390d409cbc with SHA-1 d4bc3f2adb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12062649

Change-Id: I3fdf599e9f5a26119beca40dc550b9f95b667a0b
2020-07-02 01:34:43 +00:00
Suren Baghdasaryan
0b7c9c2bff [automerger skipped] libprocessgroup: Allow vendor profile attributes to override system ones am: d4bc3f2adb am: ca6012a07d -s ours am: 90b5e843fb -s ours am: 49ce30b86e -s ours
am skip reason: Change-Id I71a2ee4d4b3c585e7c9a01b791e973390d409cbc with SHA-1 81b9f0b763 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12062649

Change-Id: Ia654bab340f6b4c8fba1f5c937210243f1618c83
2020-07-02 01:34:25 +00:00
Suren Baghdasaryan
42b6fdc340 [automerger skipped] libprocessgroup: Allow vendor profile attributes to override system ones am: d4bc3f2adb -s ours am: eae512f303 -s ours am: f93333790f -s ours
am skip reason: Change-Id I71a2ee4d4b3c585e7c9a01b791e973390d409cbc with SHA-1 d4bc3f2adb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12062649

Change-Id: Ib1c24943a72ea7d9ca4f0dbd95bfff8641bcbdeb
2020-07-02 01:19:53 +00:00
Automerger Merge Worker
ffea2bfce3 Merge "[automerger skipped] libprocessgroup: Allow vendor profile attributes to override system ones am: d4bc3f2adb am: ca6012a07d am: 93082029a1 -s ours" into rvc-qpr-dev-plus-aosp 2020-07-02 01:19:45 +00:00