Eric Laurent
afbe4d2d37
[automerged blank] resolve merge conflicts of 7b77d473a7
to tm-dev 2p: 5f85a1763f
2p: c210a6751c
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692477
Bug: 223736548
Change-Id: Ia0a117fc9ec129beefa04f902c322309115679b3
2022-04-12 12:14:05 +00:00
Eric Laurent
c210a6751c
[automerge] resolve merge conflicts of 7b77d473a7
to tm-dev 2p: 5f85a1763f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692477
Bug: 223736548
Change-Id: I6c2c70d4fe116ab87086006a39f0255f598a90b3
2022-04-12 12:13:58 +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
shawnlin
7e24a257ef
[automerge] Update status bar height res to correct size 2p: fb9b9c83c4
am: b079c10eb3
am: 8142ccbe43
am: 44125c063b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17686747
Change-Id: If91ecac29cda15f1c4cfc5a0a625caf82564bc9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 03:15:50 +00:00
shawnlin
4e056850e6
[automerge] Update status bar height res to correct size 2p: fb9b9c83c4
am: b079c10eb3
am: 8142ccbe43
am: aa93c9f454
am: ad802ec13c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17686747
Change-Id: Ie58e9d90057811e3331a78ebf8e47c376cb18c1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 03:14:20 +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
44125c063b
[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: Ida753a5ab58b590f657a3ffc4274d1a0e6c6b805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 02:39:43 +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
chungkai
425b6874fc
Enable load kernel modules in parallel am: 36e728a381
am: 272c2ce425
am: 8d7ba8a5b4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17690765
Change-Id: I2f967ad4a81bf088b16e2903ee8c823a18d9c4b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 02:36:23 +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
a2e4b1843c
Enable load kernel modules in parallel am: 36e728a381
am: 5e1d0adcad
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17690765
Change-Id: I950fa45e8518527e118baddd7f6770341636775d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 02:07:58 +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
5e1d0adcad
Enable load kernel modules in parallel am: 36e728a381
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17690765
Change-Id: Ib8628e79460ccbfd4ab6e9ebdf2aaafbd9ba6c25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 01:43:28 +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
Steve Berbary
a33b526b88
Update oriole SVN to 26 am: 08d806ddfd
am: dd07c1c6d4
am: 505a101117
am: bed94809b8
am: d5dc3b9d4d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364
Change-Id: I98278c439771b0cae1af85b152ca7bdd83595fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 17:09:52 +00:00
Steve Berbary
9e4227bf7a
Update raven SVN to 26 am: 77bcf08c3a
am: 6130465028
am: f82eac9ed6
am: 6dc7e33c51
am: fbbcd60a20
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17607945
Change-Id: Ie13af0bb8e1ee5f9e61afcd0af8dd6423b37f005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 17:09:45 +00:00
TreeHugger Robot
b13d326660
Merge changes from topic "presubmit-am-0be9c78d93d143ea893abc2e69997e6e" into sc-v2-dev-plus-aosp am: 319009ffc5
am: 13d24861b2
am: add238ffa5
am: 10a0c6fc7d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364
Change-Id: I3c5997e186ec638906e4316c737267c857fb1ea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 17:09:38 +00:00
TreeHugger Robot
95648759ab
Merge changes from topic "presubmit-am-45c82800be5d4e2ea03d01bd258037f1" into sc-v2-dev-plus-aosp am: aa3b845972
am: b8003fdd17
am: b7c7169d47
am: 99dd1380ad
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17607945
Change-Id: Iea3295145ac6905ceda13b203e4d8728c7f96816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 17:09:06 +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
9d3a5bd5ce
Update oriole SVN to 26 am: 08d806ddfd
am: dd07c1c6d4
am: 505a101117
am: eaa22214e1
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364
Change-Id: I3c039f03c1b96961941ee0a54f5b41eb1d8bff0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:54:16 +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
Steve Berbary
1903eed926
Update raven SVN to 26 am: 77bcf08c3a
am: 6130465028
am: f82eac9ed6
am: dd39bce195
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17607945
Change-Id: I5e8a7a0a5dce1bcb05d4b80debfda2265a78c99d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:54:09 +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
e26268469e
Merge changes from topic "presubmit-am-0be9c78d93d143ea893abc2e69997e6e" into sc-v2-dev-plus-aosp am: 319009ffc5
am: 13d24861b2
am: 1ebd8de8a7
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364
Change-Id: I19e99eb7c0e6baa1391f032e4592ea00b080647b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:54:02 +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
TreeHugger Robot
32f527c939
Merge changes from topic "presubmit-am-45c82800be5d4e2ea03d01bd258037f1" into sc-v2-dev-plus-aosp am: aa3b845972
am: b8003fdd17
am: 19f706583e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17607945
Change-Id: I6fd769c69ab5f995837a3e8ef4e44565f08d7468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:53:32 +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
eaa22214e1
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: Ia2af1b87ce75f59758ebdbf0ff965d799f4d9c26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:30:20 +00:00
Steve Berbary
dd39bce195
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: Ica9fa7d6e1ede0bd108bd5c09ae26cdb72dc22cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:30:15 +00:00
TreeHugger Robot
1ebd8de8a7
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: I299316159d231a86e4b255900468b90249b56e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:30:10 +00:00
TreeHugger Robot
19f706583e
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: I5ab052acc8ae72ca314d1c156b77fa25bb019ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:29:43 +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
Bill Yi
f90c7e08c6
[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: 79fa7f99b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2059207
Change-Id: I9110136f74606733317616e0233d7992fed14763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 21:04:02 +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
e0f9a42d13
[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: 777ea07181
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2059207
Change-Id: I6038f6d5bbbdf00a5c2b9254e81528117b292f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:02:42 +00:00