Xin Li
441255f85a
[automerger skipped] Merge Android 14 am: 1fba35369d
-s ours am: 5139499d27
-s ours am: 8a40eef5f4
-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: Id8a78439c2bc1fb54c693a6e7ee4e7a016e2ebe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:50:59 +00:00
Xin Li
8a40eef5f4
[automerger skipped] Merge Android 14 am: 1fba35369d
-s ours am: 5139499d27
-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: I2669428832c896012bbf2dcaceb950a69c9402f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:59:23 +00:00
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
c9449d8452
[automerger skipped] Merge UP1A.231005.007 am: 08f3aa6503
-s ours am: 057645d3b3
-s ours
...
am skip reason: Merged-In I8bd0f5ef94ca1d5e118a701a4cfff58599537476 with SHA-1 f538f8e771
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24878885
Change-Id: I9237d98f2cef3b1b8473df6c2cda076e136fbe25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 08:16:27 +00:00
Xin Li
057645d3b3
[automerger skipped] Merge UP1A.231005.007 am: 08f3aa6503
-s ours
...
am skip reason: Merged-In I8bd0f5ef94ca1d5e118a701a4cfff58599537476 with SHA-1 f538f8e771
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24878885
Change-Id: Ief63652d08a62e5a17c4639a02af59a53483d5c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:15:38 +00: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
e54620d2a2
Set the blew prebuilt apps to PRESIGNED am: db6cb71439
am: f05ee3a530
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24843850
Change-Id: I13f6533c404693a23e097f0aaa6b18394593e165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 22:47:04 +00:00
Wilson Sung
f05ee3a530
Set the blew prebuilt apps to PRESIGNED am: db6cb71439
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24843850
Change-Id: I012bdf5492f7b39fcee2bd4141731e2303abcb70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 21:54:20 +00: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
Ankur Bakshi
0e960a76ac
Update felix SVN to 27 am: f6c3f2ce0c
am: 9d89d73d20
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675
Change-Id: I55cf2a91331eb705650e1605c7893e47303208e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:49:39 +00:00
Ankur Bakshi
d4f5bdbe96
Update felix SVN to 26 am: c49c6b44d2
am: d9028f34f0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728
Change-Id: I4311d6171d6a8f96ef73a11fdd913ad870a5db55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:49:36 +00:00
Ankur Bakshi
9a6d834f44
Update felix SVN to 27 am: f6c3f2ce0c
am: d5b94a8bf9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675
Change-Id: I0fd0ff42af30f472b48fe7f50913c840fac16e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:45:52 +00:00
Ankur Bakshi
2d5e5165aa
Update felix SVN to 26 am: c49c6b44d2
am: f6c261df65
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728
Change-Id: I733082c9d7fab216b44e7926ca76fe27c66f97cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:45:49 +00:00
Ankur Bakshi
d5b94a8bf9
Update felix SVN to 27 am: f6c3f2ce0c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675
Change-Id: Id499beb6224f0f014603e2b4fe66d5d3603faae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:53:43 +00:00
Ankur Bakshi
f6c261df65
Update felix SVN to 26 am: c49c6b44d2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728
Change-Id: I56a42978fee63649a6d78a7a14df7d7fe320beb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:53:40 +00:00
Ankur Bakshi
9d89d73d20
Update felix SVN to 27 am: f6c3f2ce0c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675
Change-Id: I9cc17adb6cea0c3d07df1cf2bebe57afb1a4c08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:50:05 +00:00
Ankur Bakshi
d9028f34f0
Update felix SVN to 26 am: c49c6b44d2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728
Change-Id: Id72880a559a34e3116b06dc21a2eabb3054e42e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:50:03 +00:00
Ankur Bakshi
f6c3f2ce0c
Update felix SVN to 27
...
Bug: 298087649
Change-Id: I3466d207247e9a8fc26c785e197b16668d33390c
2023-09-08 01:35:40 +00:00
Ankur Bakshi
c49c6b44d2
Update felix SVN to 26
...
Bug: 298087649
Change-Id: I8241b1c4cb733ba18e7970ec74be837b53371707
2023-09-07 05:19:20 +00:00
Wilson Sung
981057ce92
Update UWB CERTIFICATE to PRESIGNED am: 0d937f7123
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24681110
Change-Id: I77be0eb165344b3b9a6e32d6cbe4518d67daec04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 22:56:30 +00:00
Wilson Sung
0d937f7123
Update UWB CERTIFICATE to PRESIGNED
...
Bug: 290766628
Change-Id: Id5ec87873a34a7c27f1b90209385884196efae1d
2023-09-06 17:26:18 +00:00
Xin Li
f34af8bb46
[automerger skipped] Merge UP1A.230905.019 am: 12032b942f
-s ours am: 32953a9018
-s ours
...
am skip reason: Merged-In I4890e0ed2191993887aa550053a827c2aca3aafe with SHA-1 64da307f5f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24624441
Change-Id: I192dbf0edc60f1db233201777bef349a46f7c83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:34:36 +00:00
Xin Li
32953a9018
[automerger skipped] Merge UP1A.230905.019 am: 12032b942f
-s ours
...
am skip reason: Merged-In I4890e0ed2191993887aa550053a827c2aca3aafe with SHA-1 64da307f5f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24624441
Change-Id: I482d9b52ba5b5beb6888719e8609cd75adc73e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:45:20 +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
4fcacced52
[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 66e687a2a4
-s ours am: f4b38e7b46
-s ours
...
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703
Change-Id: I90d949caaa1be25870115a8ed82732c52aed4eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:40:44 +00:00
Xin Li
721d839d2a
[automerger skipped] Merge Android U (ab/10368041) am: d1c9942792
-s ours am: b7cf79b50d
-s ours
...
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703
Change-Id: Iaf68020e3327bc52f0dd2141c4d5b669016d575c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:35:25 +00:00
Florian Mayer
4165369e1c
Add aosp_felix_hwasan am: c2556c4c61
am: 50889ad4db
am: 9c8f7cff7b
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295
Change-Id: Idb24b83a65598fc76197639461a0fb4e7b7470e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:26:03 +00:00
Xin Li
f4b38e7b46
[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 66e687a2a4
-s ours
...
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703
Change-Id: Ief104b9a8579ed786718adf55dfad6e0ef4a2f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:04:44 +00:00
Xin Li
b7cf79b50d
[automerger skipped] Merge Android U (ab/10368041) am: d1c9942792
-s ours
...
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703
Change-Id: I261bdf7ef23cfabc3ed6a0fe67b2044509d108cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:59:25 +00:00
Florian Mayer
9c8f7cff7b
Add aosp_felix_hwasan am: c2556c4c61
am: 50889ad4db
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295
Change-Id: Idac8aa35d09e6eeaa92a9125ee39ce2421ca1096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:42:54 +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