Xin Li
5139499d27
[automerger skipped] Merge Android 14 am: 1fba35369d
-s ours
...
am skip reason: Merged-In Ia42c74a3fab73b984823796b61b0e66f7662ac53 with SHA-1 db6cb71439
is already in history
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2775094
Change-Id: I81d5e347e4cf057faa89f4158a437b4e089d79b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:52:18 +00:00
Xin Li
1fba35369d
Merge Android 14
...
Bug: 298295554
Merged-In: Ia42c74a3fab73b984823796b61b0e66f7662ac53
Change-Id: I08cb8a2b2050c04b370de78fd0d422730cc60171
2023-10-05 15:33:08 -07:00
Xin Li
08f3aa6503
Merge UP1A.231005.007
...
Bug: 291102124
Merged-In: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I218ff755949e928013808486639b33d81dde763b
2023-09-27 16:04:17 -07:00
Wilson Sung
db6cb71439
Set the blew prebuilt apps to PRESIGNED
...
Keep PixelQualifiedNetworksService platfrom key
Other apps are no need to re-sign
Bug: 290766628
Change-Id: Ia42c74a3fab73b984823796b61b0e66f7662ac53
2023-09-23 03:37:58 +00:00
Xin Li
12032b942f
Merge UP1A.230905.019
...
Merged-In: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: I6a61ab7455e00e60b4944f19a6d84bf859c642a9
2023-08-31 12:12:38 -07:00
Android Build Coastguard Worker
163db5e320
[coastguard skipped] Merge sparse cherrypicks from sparse-10740638-L17800000962853027 into udc-release.
...
COASTGUARD_SKIP: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
COASTGUARD_SKIP: I077f038eb8bf515ea39a096ce8c4820e3af09ea3
Change-Id: I803c919e9df77054be6165dffc496c487ca819d2
2023-08-30 23:17:53 +00:00
Android Build Coastguard Worker
c9a1c8da2d
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436880'] into sparse-10740638-L17800000962853027.
...
SPARSE_CHANGE: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I077f038eb8bf515ea39a096ce8c4820e3af09ea3
2023-08-30 23:10:21 +00:00
Lokesh Kumar Goel
c76769f812
Update felix SVN to 25
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f538f8e771f5f8d8866c49dddbf82254d8e39f85 )
Merged-In: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
2023-08-30 23:08:31 +00:00
Android Build Coastguard Worker
a2c53a4e0e
[coastguard skipped] Merge sparse cherrypicks from sparse-10739010-L93800000962847818 into udc-release.
...
COASTGUARD_SKIP: I9a8dc43afb701b8c06ac5f36484fcf335608d657
COASTGUARD_SKIP: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I9ad70de4979688117c0873b7b784dedbd62ba92c
2023-08-30 18:58:21 +00:00
Android Build Coastguard Worker
3734416dce
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436880'] into sparse-10739010-L93800000962847818.
...
SPARSE_CHANGE: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I9a8dc43afb701b8c06ac5f36484fcf335608d657
2023-08-30 18:50:45 +00:00
Lokesh Kumar Goel
eb6f4a6efd
Update felix SVN to 25
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f538f8e771f5f8d8866c49dddbf82254d8e39f85 )
Merged-In: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
2023-08-30 18:48:39 +00:00
Xin Li
66e687a2a4
Merge "Merge Android U (ab/10368041)" into aosp-main-future
2023-08-28 22:12:23 +00:00
Florian Mayer
50889ad4db
Add aosp_felix_hwasan am: c2556c4c61
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295
Change-Id: I29e672a12cd2cec8bcb880c19f99dbd03fe2aac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 22:11:26 +00:00
Florian Mayer
c2556c4c61
Add aosp_felix_hwasan
...
Bug: 297918380
Change-Id: I934dc696c9066bdc337a4279296b91744d0b0382
2023-08-28 13:11:01 -07:00
Android Build Coastguard Worker
3452e1c46c
[coastguard skipped] Merge sparse cherrypicks from sparse-10705648-L70200000962736881 into udc-release.
...
COASTGUARD_SKIP: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
COASTGUARD_SKIP: Ibe8f592fbf8506c33b06cc47b0dd8d5489d68633
Change-Id: Idae0eec8299c1b6d47fc444c18e7cf1284353826
2023-08-23 23:46:15 +00:00
Android Build Coastguard Worker
c5c08f04f3
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436880'] into sparse-10705648-L70200000962736881.
...
SPARSE_CHANGE: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: Ibe8f592fbf8506c33b06cc47b0dd8d5489d68633
2023-08-23 23:40:38 +00:00
Lokesh Kumar Goel
9d2c9c3ee4
Update felix SVN to 25
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f538f8e771f5f8d8866c49dddbf82254d8e39f85 )
Merged-In: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
2023-08-23 23:39:01 +00:00
Android Build Coastguard Worker
cd7794f22d
[coastguard skipped] Merge sparse cherrypicks from sparse-10696112-L14300000962710292 into udc-release.
...
COASTGUARD_SKIP: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
COASTGUARD_SKIP: I6a31237bc964df3390b1dca40062ca4d2e54d516
Change-Id: Ie2c6dfe7bc7b2024fef5d2375d24ac55411a4bf9
2023-08-22 21:17:48 +00:00
Android Build Coastguard Worker
7a1982acb3
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436880'] into sparse-10696112-L14300000962710292.
...
SPARSE_CHANGE: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I6a31237bc964df3390b1dca40062ca4d2e54d516
2023-08-22 21:11:18 +00:00
Lokesh Kumar Goel
b958006515
Update felix SVN to 25
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f538f8e771f5f8d8866c49dddbf82254d8e39f85 )
Merged-In: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
2023-08-22 21:09:27 +00:00
Android Build Coastguard Worker
2b2445c7a7
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24374051', 'googleplex-android-review.googlesource.com/24394073', 'googleplex-android-review.googlesource.com/24426027', 'googleplex-android-review.googlesource.com/24220184'] into udc-release.
...
Change-Id: I0e5f7e019560f636d05121ac7b33937589965f2f
2023-08-22 02:18:45 +00:00
Edwin Tung
4214a4b7ad
gps: Disable Vzw SUPL OTDOA
...
Bug: 293213801
Test: OTDOA disabled
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c9015ef36bd0eaf35179f6d726e13e48dd7974bb )
Merged-In: I402e5c6e0cb54eb0596cf846483b63d356992b65
Change-Id: I402e5c6e0cb54eb0596cf846483b63d356992b65
2023-08-22 02:07:32 +00:00
Lokesh Kumar Goel
ce96371fc2
Update felix SVN to 24
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0368e3e8219b7187bc7acf08d4d6b9063ddd2b48 )
Merged-In: I64164674d19b1e7d49094fed2175ec7c63f9ad82
Change-Id: I64164674d19b1e7d49094fed2175ec7c63f9ad82
2023-08-22 02:07:25 +00:00
Bassem Khalife
c506f0cddd
Update felix SVN to 23
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4ecf2187a2dc4a314562289ed2528d787eb28e74 )
Merged-In: I3f4936d26b869ca400be05386fc009d95cf003c2
Change-Id: I3f4936d26b869ca400be05386fc009d95cf003c2
2023-08-22 02:07:16 +00:00
Bassem Khalife
755154d6d4
Update felix SVN to 22
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:64da307f5ff10d31859213a49f3dc71874da3f6d )
Merged-In: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: I4890e0ed2191993887aa550053a827c2aca3aafe
2023-08-22 02:07:06 +00:00
Android Build Coastguard Worker
c5f4615a67
[coastguard skipped] Merge sparse cherrypicks from sparse-10685236-L90500000962658543 into udc-release.
...
COASTGUARD_SKIP: I4890e0ed2191993887aa550053a827c2aca3aafe
COASTGUARD_SKIP: I3f4936d26b869ca400be05386fc009d95cf003c2
COASTGUARD_SKIP: I4213eb0d7df99e067ff3ca02894b5acc9119b899
Change-Id: Ica84a538ad188e7d54f19ac53569c2c5e436bb32
2023-08-20 08:14:56 +00:00
Android Build Coastguard Worker
23556e99d6
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24374051', 'googleplex-android-review.googlesource.com/24394073'] into sparse-10685236-L90500000962658543.
...
SPARSE_CHANGE: I4890e0ed2191993887aa550053a827c2aca3aafe
SPARSE_CHANGE: I3f4936d26b869ca400be05386fc009d95cf003c2
Change-Id: I4213eb0d7df99e067ff3ca02894b5acc9119b899
2023-08-20 08:08:58 +00:00
Bassem Khalife
fc2ed141fe
Update felix SVN to 23
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4ecf2187a2dc4a314562289ed2528d787eb28e74 )
Merged-In: I3f4936d26b869ca400be05386fc009d95cf003c2
Change-Id: I3f4936d26b869ca400be05386fc009d95cf003c2
2023-08-20 08:07:37 +00:00
Bassem Khalife
88f0b8a102
Update felix SVN to 22
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:64da307f5ff10d31859213a49f3dc71874da3f6d )
Merged-In: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: I4890e0ed2191993887aa550053a827c2aca3aafe
2023-08-20 08:07:30 +00:00
Android Build Coastguard Worker
9fac1705b8
[coastguard skipped] Merge sparse cherrypicks from sparse-10685236-L61400000962657635 into udc-release.
...
COASTGUARD_SKIP: I5a46647c6b95a36110a1da4b582923d95af3a483
COASTGUARD_SKIP: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: Ibf0017635941db5746d7d5798dcb51bf20334a59
2023-08-20 07:34:03 +00:00
Android Build Coastguard Worker
141191ca65
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24374051'] into sparse-10685236-L61400000962657635.
...
SPARSE_CHANGE: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: I5a46647c6b95a36110a1da4b582923d95af3a483
2023-08-20 07:28:09 +00:00
Bassem Khalife
21b1943eb0
Update felix SVN to 22
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:64da307f5ff10d31859213a49f3dc71874da3f6d )
Merged-In: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: I4890e0ed2191993887aa550053a827c2aca3aafe
2023-08-20 07:26:34 +00:00
Xin Li
d1c9942792
Merge Android U (ab/10368041)
...
Bug: 291102124
Merged-In: Ia11da7d008b96baf8aa7b2aa057ae87164b36052
Change-Id: I2299d73a593a5ee839ee41e0f74c45853c982748
2023-08-14 15:33:18 -07:00
Android Build Coastguard Worker
4524578ecb
[coastguard skipped] Merge sparse cherrypicks from sparse-10656238-L31700000962567991 into udc-release.
...
COASTGUARD_SKIP: I3f4936d26b869ca400be05386fc009d95cf003c2
COASTGUARD_SKIP: I4890e0ed2191993887aa550053a827c2aca3aafe
COASTGUARD_SKIP: I55c06c262882796cad667783991b383f5f59ae43
Change-Id: I4ac3fea43215f49134e224a787b61d40bfc44cbd
2023-08-14 22:22:06 +00:00
Android Build Coastguard Worker
3de616da53
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24374051', 'googleplex-android-review.googlesource.com/24394073'] into sparse-10656238-L31700000962567991.
...
SPARSE_CHANGE: I4890e0ed2191993887aa550053a827c2aca3aafe
SPARSE_CHANGE: I3f4936d26b869ca400be05386fc009d95cf003c2
Change-Id: I55c06c262882796cad667783991b383f5f59ae43
2023-08-14 22:16:17 +00:00
Bassem Khalife
8a804d7012
Update felix SVN to 23
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4ecf2187a2dc4a314562289ed2528d787eb28e74 )
Merged-In: I3f4936d26b869ca400be05386fc009d95cf003c2
Change-Id: I3f4936d26b869ca400be05386fc009d95cf003c2
2023-08-14 22:12:46 +00:00
Bassem Khalife
da7b440231
Update felix SVN to 22
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:64da307f5ff10d31859213a49f3dc71874da3f6d )
Merged-In: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: I4890e0ed2191993887aa550053a827c2aca3aafe
2023-08-14 22:12:24 +00:00
Android Build Coastguard Worker
a9fba5449d
[coastguard skipped] Merge sparse cherrypicks from sparse-10656238-L18400000962566963 into udc-release.
...
COASTGUARD_SKIP: I4890e0ed2191993887aa550053a827c2aca3aafe
COASTGUARD_SKIP: I4c0e07a3ca782c1d86741b1b94205f6d2112e246
Change-Id: Ic9f3ccb1c716b9dc4f3af954e2a36c99177f00a4
2023-08-14 21:31:37 +00:00
Android Build Coastguard Worker
b956719bb2
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24374051'] into sparse-10656238-L18400000962566963.
...
SPARSE_CHANGE: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: I4c0e07a3ca782c1d86741b1b94205f6d2112e246
2023-08-14 21:23:41 +00:00
Bassem Khalife
3eca26b6a7
Update felix SVN to 22
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:64da307f5ff10d31859213a49f3dc71874da3f6d )
Merged-In: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: I4890e0ed2191993887aa550053a827c2aca3aafe
2023-08-14 21:21:51 +00:00
Android Build Coastguard Worker
e795b84ba7
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24185697'] into udc-release.
...
Change-Id: I03e003cea0dd8878ffcb75861f9ff705f185e154
2023-08-14 19:53:03 +00:00
Bassem Khalife
5c1deed09f
Update felix SVN to 21
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:29203a354d62370c5bd4e6e92592a00eead176e6 )
Merged-In: Ib78cdb211e25b1ae28d120a974514de4c6db8d43
Change-Id: Ib78cdb211e25b1ae28d120a974514de4c6db8d43
2023-08-14 19:51:24 +00:00
Android Build Coastguard Worker
ae5ae75b14
[coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L16700000962543246 into udc-release.
...
COASTGUARD_SKIP: I09e8877ac2325a0056c931ce01602fffb7e68c35
COASTGUARD_SKIP: I1cf8decc7bbd6b7f2316dbae4f165f09dde1d37f
Change-Id: I97d7c785fa95d373cd2caa7f32fb220f2cffda6d
2023-08-12 00:33:32 +00:00
Android Build Coastguard Worker
cd08a16c9f
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24338862'] into sparse-10644925-L16700000962543246.
...
SPARSE_CHANGE: I09e8877ac2325a0056c931ce01602fffb7e68c35
Change-Id: I1cf8decc7bbd6b7f2316dbae4f165f09dde1d37f
2023-08-12 00:27:09 +00:00
Neha Jain
1bcf28495a
Revert "Revert "Update felix SVN to 21""
...
This reverts commit b6fc908043
.
Reason for revert: Need the SVN for F10 KDDI build
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5ee36bd203f098b21b90e43ae9967a93f493ddb9 )
Merged-In: I09e8877ac2325a0056c931ce01602fffb7e68c35
Change-Id: I09e8877ac2325a0056c931ce01602fffb7e68c35
2023-08-12 00:26:01 +00:00
Android Build Coastguard Worker
0df82ab980
[coastguard skipped] Merge sparse cherrypicks from sparse-10616066-L90100000962413158 into udc-release.
...
COASTGUARD_SKIP: I09e8877ac2325a0056c931ce01602fffb7e68c35
COASTGUARD_SKIP: Id94cf42880f2d65d98fb9c06b3eb6ac1a0921ceb
Change-Id: I1c42c57a382e2d2596f1c18b1bdad3c6a357de14
2023-08-06 22:59:16 +00:00
Android Build Coastguard Worker
c83580a8c5
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24338862'] into sparse-10616066-L90100000962413158.
...
SPARSE_CHANGE: I09e8877ac2325a0056c931ce01602fffb7e68c35
Change-Id: Id94cf42880f2d65d98fb9c06b3eb6ac1a0921ceb
2023-08-06 22:54:56 +00:00
Neha Jain
b96cf63bba
Revert "Revert "Update felix SVN to 21""
...
This reverts commit b6fc908043
.
Reason for revert: Need the SVN for F10 KDDI build
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5ee36bd203f098b21b90e43ae9967a93f493ddb9 )
Merged-In: I09e8877ac2325a0056c931ce01602fffb7e68c35
Change-Id: I09e8877ac2325a0056c931ce01602fffb7e68c35
2023-08-06 22:54:49 +00:00
Android Build Coastguard Worker
a66144697e
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24288899'] into udc-release.
...
Change-Id: Ia9b1d78899766f1dbc22c64a91873f6e68b6cf74
2023-08-03 01:47:42 +00:00
Neha Jain
9407daa064
Revert "Update felix SVN to 21"
...
This reverts commit 29203a354d
.
Reason for revert: b/289414927
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b6fc908043b39da2ab21fe95ff9b4899dc323449 )
Merged-In: I37230a6d768bd2293b7c9fb4bf9659b9a31f5ae8
Change-Id: I37230a6d768bd2293b7c9fb4bf9659b9a31f5ae8
2023-08-03 01:46:30 +00:00