Commit graph

3146 commits

Author SHA1 Message Date
Eric Laurent
f9e270f775 [automerger skipped] Merge changes from topic "presubmit-am-1830507c0de2408caacf9436d85826eb" into sc-v2-dev-plus-aosp am: 7b77d473a7 -s ours am: 073a13490c -s ours am: f2cac81514 -s ours
am skip reason: skipped by user elaurent

Original change: undetermined

Change-Id: If324ef16c7127049faf50476fc6c2a685b5adee9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:44:42 +00:00
Eric Laurent
73de9e53f5 resolve merge conflicts of 7b77d473a7 to tm-dev am: 5f85a1763f am: 89e4c5e249
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692477

Change-Id: I6a09638f8d7e51cc5a8e359e794051373d0bb5d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:44:28 +00:00
Eric Laurent
50f952b4e8 [automerger skipped] Revert "DO NOT MERGE audio: add immersive output" am: 69e753be8a am: bf45c918a4 -s ours am: 7a4168d9be -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654992

Change-Id: Iae23a78c9c8005b5efff14cc068a2b5a2167732b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:24:20 +00:00
Eric Laurent
57f4f76588 [automerger skipped] Revert "DO NOT MERGE Audio configuration for spatial audio" am: 10848fe081 am: 7044b7d704 -s ours am: f0d273077f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654991

Change-Id: I2a3295c3dbdee9a0ebb376c743a0c24713a3883e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:24:19 +00:00
Eric Laurent
f2cac81514 [automerger skipped] Merge changes from topic "presubmit-am-1830507c0de2408caacf9436d85826eb" into sc-v2-dev-plus-aosp am: 7b77d473a7 -s ours am: 073a13490c -s ours
am skip reason: skipped by user elaurent

Original change: undetermined

Change-Id: I08de6f7992b0e5ecd5a7062975cc4ad89d37e672
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:23:33 +00:00
Eric Laurent
89e4c5e249 resolve merge conflicts of 7b77d473a7 to tm-dev am: 5f85a1763f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692477

Change-Id: Id46b9587e045233a833938dc7637fdd4246ad37b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:22:22 +00:00
Eric Laurent
7a4168d9be [automerger skipped] Revert "DO NOT MERGE audio: add immersive output" am: 69e753be8a am: bf45c918a4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654992

Change-Id: Ic8e006ac7bd960bcab4428318257fb9dd9aff191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:21:43 +00:00
Eric Laurent
f0d273077f [automerger skipped] Revert "DO NOT MERGE Audio configuration for spatial audio" am: 10848fe081 am: 7044b7d704 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654991

Change-Id: I4da097fbd3b0ebaf366bd32bf4a80c8a3ec67741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:21:42 +00:00
Eric Laurent
073a13490c [automerger skipped] Merge changes from topic "presubmit-am-1830507c0de2408caacf9436d85826eb" into sc-v2-dev-plus-aosp am: 7b77d473a7 -s ours
am skip reason: skipped by user elaurent

Original change: undetermined

Change-Id: Ifc70cb5b674d069a1a9726527c15b7b4ae7b41f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:21:33 +00:00
Eric Laurent
5f85a1763f resolve merge conflicts of 7b77d473a7 to tm-dev
Revert "DO NOT MERGE Audio configuration for spatial audio"

Bug: 223736548
Test: make
This reverts commit edfc5e86bd.

Change-Id: Ie693f24b76d00469ad71a36989e481023946c3bb
2022-04-12 11:17:09 +02:00
Eric Laurent
bf45c918a4 Revert "DO NOT MERGE audio: add immersive output" am: 69e753be8a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654992

Change-Id: I04c56f53d48a86c456947f47ce91020f4c1727b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 08:29:35 +00:00
Eric Laurent
7044b7d704 Revert "DO NOT MERGE Audio configuration for spatial audio" am: 10848fe081
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654991

Change-Id: Ide5de220ec0c8d82a0f16efbc3c061788539db35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 08:29:34 +00:00
Eric Laurent
69e753be8a Revert "DO NOT MERGE audio: add immersive output"
Bug: 223736548
Test: make

This reverts commit d91acaba1a.

Change-Id: I18aa2cb60403b131dcf353f8b51e831a9f4614da
2022-04-12 08:00:52 +00:00
Eric Laurent
7b77d473a7 Merge changes from topic "presubmit-am-1830507c0de2408caacf9436d85826eb" into sc-v2-dev-plus-aosp
* changes:
  [automerge] Revert "DO NOT MERGE Audio configuration for spatial audio" 2p: f4f8fa1fed
  Revert "DO NOT MERGE Audio configuration for spatial audio"
2022-04-12 08:00:52 +00:00
Eric Laurent
10848fe081 Revert "DO NOT MERGE Audio configuration for spatial audio"
Bug: 223736548
Test: make
This reverts commit edfc5e86bd.

Change-Id: Ie693f24b76d00469ad71a36989e481023946c3bb
2022-04-12 08:00:52 +00:00
shawnlin
ad802ec13c [automerge] Update status bar height res to correct size 2p: fb9b9c83c4 am: b079c10eb3 am: 8142ccbe43 am: aa93c9f454
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17686747

Change-Id: I3f9e20a8c241ee316062036ceb049e9c449fa340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 03:00:12 +00:00
shawnlin
aa93c9f454 [automerge] Update status bar height res to correct size 2p: fb9b9c83c4 am: b079c10eb3 am: 8142ccbe43
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17686747

Change-Id: I6cea40f9f714ced0c86a374615d9db807e1ebcb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 02:38:04 +00:00
shawnlin
8142ccbe43 [automerge] Update status bar height res to correct size 2p: fb9b9c83c4 am: b079c10eb3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17686747

Change-Id: Id2331d2e592e977747e7c7e74992415f8f511748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 02:35:46 +00:00
chungkai
8d7ba8a5b4 Enable load kernel modules in parallel am: 36e728a381 am: 272c2ce425
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17690765

Change-Id: I1f5702855ef81b4d053320fa52bd419d9fa9f6df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 02:08:31 +00:00
chungkai
272c2ce425 Enable load kernel modules in parallel am: 36e728a381
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17690765

Change-Id: I2e06dcd32989f4a0c37b543514d5fd9b9db9bc8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 01:44:15 +00:00
chungkai
36e728a381 Enable load kernel modules in parallel
only enable for launched project.

Test: boot to home screen without error and avc denials on R4/O6
Bug: 180676019
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: I374a25b3c7debcf8a268e62f939a7909b31fe1e8
2022-04-11 09:21:28 +00:00
shawnlin
b079c10eb3 [automerge] Update status bar height res to correct size 2p: fb9b9c83c4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17686747

Bug: 216782082
Change-Id: I38b632931f5865fa9eb27565abcdeec0ed10ac58
2022-04-11 06:02:04 +00:00
shawnlin
fb9b9c83c4 Update status bar height res to correct size
Test: make
Bug: 216782082
Change-Id: Ibc23f990e4fda040a86b52f78effce6da0235931
2022-04-11 11:52:09 +08:00
Android Build Coastguard Worker
35c3e4074b Snap for 8432959 from d5dc3b9d4d to tm-qpr1-release
Change-Id: Ie1bb8ab92c088050ddb5b15b291deb551fb01151
2022-04-11 01:01:34 +00:00
Steve Berbary
d5dc3b9d4d Update oriole SVN to 26 am: 08d806ddfd am: dd07c1c6d4 am: 505a101117 am: bed94809b8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364

Change-Id: I3ba169ad4b1ec30514cb555e15af3258d354e676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:54:19 +00:00
Steve Berbary
fbbcd60a20 Update raven SVN to 26 am: 77bcf08c3a am: 6130465028 am: f82eac9ed6 am: 6dc7e33c51
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17607945

Change-Id: Ic2ec8a33aa174b095aeee36ddb5bcfe4998ab367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:54:14 +00:00
TreeHugger Robot
10a0c6fc7d Merge changes from topic "presubmit-am-0be9c78d93d143ea893abc2e69997e6e" into sc-v2-dev-plus-aosp am: 319009ffc5 am: 13d24861b2 am: add238ffa5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364

Change-Id: Ice62fe57b2411bcadc7afbf58d9fb4f12dc8cdde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:54:03 +00:00
TreeHugger Robot
99dd1380ad Merge changes from topic "presubmit-am-45c82800be5d4e2ea03d01bd258037f1" into sc-v2-dev-plus-aosp am: aa3b845972 am: b8003fdd17 am: b7c7169d47
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17607945

Change-Id: I94843085bcb36d7d0d33306168360f13454f804c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:53:47 +00:00
Steve Berbary
bed94809b8 Update oriole SVN to 26 am: 08d806ddfd am: dd07c1c6d4 am: 505a101117
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364

Change-Id: I151de1d1368bdfb0209ca3ee04f70ea661a866fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:31:19 +00:00
Steve Berbary
6dc7e33c51 Update raven SVN to 26 am: 77bcf08c3a am: 6130465028 am: f82eac9ed6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17607945

Change-Id: I89c9c9de8e98da0743e9369f2ba036318f1157dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:31:13 +00:00
TreeHugger Robot
add238ffa5 Merge changes from topic "presubmit-am-0be9c78d93d143ea893abc2e69997e6e" into sc-v2-dev-plus-aosp am: 319009ffc5 am: 13d24861b2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364

Change-Id: I4dafca64227ecefba5a7768475959c0ee7cfc33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:31:08 +00:00
TreeHugger Robot
b7c7169d47 Merge changes from topic "presubmit-am-45c82800be5d4e2ea03d01bd258037f1" into sc-v2-dev-plus-aosp am: aa3b845972 am: b8003fdd17
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17607945

Change-Id: I540c5c1a3f3a0917cb50902bf83fac3cc8556629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:30:30 +00:00
Steve Berbary
505a101117 Update oriole SVN to 26 am: 08d806ddfd am: dd07c1c6d4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364

Change-Id: I332bd0ac66495876bc56f02eb1625b8086f77e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:17:19 +00:00
Steve Berbary
f82eac9ed6 Update raven SVN to 26 am: 77bcf08c3a am: 6130465028
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17607945

Change-Id: I2e1a182d95b9cb87801a7e76204ab445f6e47f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:17:13 +00:00
TreeHugger Robot
13d24861b2 Merge changes from topic "presubmit-am-0be9c78d93d143ea893abc2e69997e6e" into sc-v2-dev-plus-aosp am: 319009ffc5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364

Change-Id: I35f059d19b040aaea02e5cbb26b025e7e7b4b8b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:16:59 +00:00
TreeHugger Robot
b8003fdd17 Merge changes from topic "presubmit-am-45c82800be5d4e2ea03d01bd258037f1" into sc-v2-dev-plus-aosp am: aa3b845972
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17607945

Change-Id: I008e6e0177da520b6e13dc3f50fa07c3af9e8b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:16:37 +00:00
Steve Berbary
dd07c1c6d4 Update oriole SVN to 26 am: 08d806ddfd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364

Change-Id: Ia6a487d3bbe9e3e80feb1ed5b4dcea12c0f5c064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:16:09 +00:00
Steve Berbary
6130465028 Update raven SVN to 26 am: 77bcf08c3a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17607945

Change-Id: I5ddbf1987ba3482ac5d875c9f58f8ddf1ed4bdf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:15:36 +00:00
Steve Berbary
08d806ddfd Update oriole SVN to 26
Bug: 228265025
Change-Id: I34050f4f12e36e671bddc3ffeb7fe17a8a19a929
2022-04-10 15:40:48 +00:00
TreeHugger Robot
319009ffc5 Merge changes from topic "presubmit-am-0be9c78d93d143ea893abc2e69997e6e" into sc-v2-dev-plus-aosp
* changes:
  [automerge] Update oriole SVN to 26 2p: 98e3641242
  Update oriole SVN to 26
2022-04-10 15:40:48 +00:00
TreeHugger Robot
aa3b845972 Merge changes from topic "presubmit-am-45c82800be5d4e2ea03d01bd258037f1" into sc-v2-dev-plus-aosp
* changes:
  [automerge] Update raven SVN to 26 2p: b08bac0ced
  Update raven SVN to 26
2022-04-10 15:40:14 +00:00
Steve Berbary
77bcf08c3a Update raven SVN to 26
Bug: 228265025
Change-Id: I0a18a8b09e060e2cbc31e69a0f8fd6675769093a
2022-04-10 15:40:14 +00:00
Android Build Coastguard Worker
7334e2cf55 Snap for 8429531 from 79fa7f99b9 to tm-qpr1-release
Change-Id: Id660684d390916b250d54b33f5dc0466fa8a5534
2022-04-09 05:06:51 +00:00
Bill Yi
79fa7f99b9 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 1d9d14d79a -s ours am: 5018ef0b54 -s ours am: 04efa92761 -s ours am: 670c677602 -s ours am: 7510324dd4 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2059207

Change-Id: I572a065f702380fda1acd64a6940c6a071aee79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:34:06 +00:00
Bill Yi
7510324dd4 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 1d9d14d79a -s ours am: 5018ef0b54 -s ours am: 04efa92761 -s ours am: 670c677602 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2059207

Change-Id: I08bd90a82cdee42467c9c29410e1fa4a69f31d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:57:21 +00:00
Bill Yi
670c677602 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 1d9d14d79a -s ours am: 5018ef0b54 -s ours am: 04efa92761 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2059207

Change-Id: I60170fbafe39e7379bac0f573e1cb6cee2afb61e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:46:27 +00:00
Bill Yi
04efa92761 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 1d9d14d79a -s ours am: 5018ef0b54 -s ours
am skip reason: Merged-In I0b367368946f7147acf241c5a88b8f31e4ba7f13 with SHA-1 be87d1152a is already in history

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2059207

Change-Id: I71734199b35182c427d20e2877b8519349672e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:14:30 +00:00
Bill Yi
5018ef0b54 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 1d9d14d79a -s ours
am skip reason: Merged-In I0b367368946f7147acf241c5a88b8f31e4ba7f13 with SHA-1 be87d1152a is already in history

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2059207

Change-Id: I7ce040b5a9c3d29ebec77f37a2a288349a363015
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:31:20 +00:00
Eric Laurent
ea94af1302 [automerge] Revert "DO NOT MERGE Audio configuration for spatial audio" 2p: f4f8fa1fed
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654991

Bug: 223736548
Change-Id: I377055b97dbd578f3cf561f67b95cb044c882b8a
2022-04-08 14:36:14 +00:00
Eric Laurent
f4f8fa1fed Revert "DO NOT MERGE Audio configuration for spatial audio"
Bug: 223736548
Test: make
This reverts commit edfc5e86bd.

Change-Id: Ie693f24b76d00469ad71a36989e481023946c3bb
2022-04-08 16:35:20 +02:00