Eric Laurent
dbcf663220
[automerger skipped] Revert "DO NOT MERGE Audio configuration for spatial audio" am: 10848fe081
am: 7044b7d704
-s ours am: f0d273077f
-s ours am: 57f4f76588
-s ours am: 32906c516d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654991
Change-Id: I35bd87c3d5aae33431e5ae5e825a0f5556907a53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:06:19 +00:00
Eric Laurent
e88678a4f7
[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: f9e270f775
-s ours
...
am skip reason: skipped by user elaurent
Original change: undetermined
Change-Id: Ic2b6eb9d1932fb973faea7772c06f3f0c4995948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:06:11 +00:00
Eric Laurent
9979dd8b62
resolve merge conflicts of 7b77d473a7
to tm-dev am: 5f85a1763f
am: 89e4c5e249
am: 73de9e53f5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692477
Change-Id: I2282e6b41c4394f94be511934782a8d031bb6d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:05:34 +00:00
Eric Laurent
6daae39ea7
[automerger skipped] Revert "DO NOT MERGE audio: add immersive output" am: 69e753be8a
am: bf45c918a4
-s ours am: 7a4168d9be
-s ours am: 3da4f1d9f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654992
Change-Id: I2b54e886c99e9739d4615367c1ef941dda7d2332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:02:44 +00:00
Eric Laurent
5abd668585
[automerger skipped] Revert "DO NOT MERGE Audio configuration for spatial audio" am: 10848fe081
am: 7044b7d704
-s ours am: f0d273077f
-s ours am: fb22920496
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654991
Change-Id: I3685168511178e171d0bc40c5ac595a931319dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:02:43 +00:00
Eric Laurent
d15b2bf8f6
[automerger skipped] Merge changes from topic "presubmit-am-1830507c0de2408caacf9436d85826eb" into sc-v2-dev-plus-aosp am: 7b77d473a7
-s ours am: 073a13490c
-s ours am: 22fbe71785
-s ours
...
am skip reason: skipped by user elaurent
Original change: undetermined
Change-Id: Iae49ef4757b6f73a93ffd444d735fdc3c560413e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:00:04 +00:00
Eric Laurent
97757b112a
[automerger skipped] Revert "DO NOT MERGE audio: add immersive output" am: 69e753be8a
am: bf45c918a4
-s ours am: 7a4168d9be
-s ours am: 50f952b4e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654992
Change-Id: I646a6b710ca45f02344a48dc6cdf0b8379c04dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:45:00 +00:00
Eric Laurent
32906c516d
[automerger skipped] Revert "DO NOT MERGE Audio configuration for spatial audio" am: 10848fe081
am: 7044b7d704
-s ours am: f0d273077f
-s ours am: 57f4f76588
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654991
Change-Id: If2c7e174b765da183ea2066539f59a4daee67cf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:44:59 +00:00
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
3da4f1d9f2
[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: I54a8246410962c2592a04616473cf7c1f95af9bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:43:58 +00:00
Eric Laurent
fb22920496
[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: I0e8016c99f8bec50c391fa2ad86c038bd061e815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:43:56 +00:00
Eric Laurent
22fbe71785
[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: Id75331a0e04a4d8e3f38b95fd3f47a18b7f40e26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:43:41 +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
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
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
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
Android Build Coastguard Worker
eb85af2aad
Merge cherrypicks of [17654991, 17654992] into sc-qpr3-release.
...
Change-Id: Ieca77df617d9ba2afa01ddd3ed243a4128dd7852
2022-04-11 23:06:05 +00:00
Eric Laurent
1b0cc335d3
Revert "DO NOT MERGE audio: add immersive output"
...
Bug: 223736548
Test: make
This reverts commit d91acaba1a
.
Change-Id: I18aa2cb60403b131dcf353f8b51e831a9f4614da
(cherry picked from commit 255e54fbb9e10017620182a38f74c6bbb0c7aa27)
Merged-In: I18aa2cb60403b131dcf353f8b51e831a9f4614da
2022-04-11 23:04:33 +00:00
Eric Laurent
10e2860d24
Revert "DO NOT MERGE Audio configuration for spatial audio"
...
Bug: 223736548
Test: make
This reverts commit edfc5e86bd
.
Change-Id: Ie693f24b76d00469ad71a36989e481023946c3bb
(cherry picked from commit f4f8fa1fed
)
Merged-In: Ie693f24b76d00469ad71a36989e481023946c3bb
2022-04-11 23:04:32 +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
Android Build Coastguard Worker
e45eb2dc65
Snap for 8432918 from 505a101117
to tm-release
...
Change-Id: I5b19dacef4049809d331c40b243a5707a2260a54
2022-04-10 23:01:49 +00:00
Android Build Coastguard Worker
9786526b6d
Snap for 8432874 from 08d806ddfd
to sc-qpr3-release
...
Change-Id: I9874cae2e0e0e4b3fefded89e46e2fb065690d28
2022-04-10 21:01:36 +00: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