Wilson Sung
0d937f7123
Update UWB CERTIFICATE to PRESIGNED
...
Bug: 290766628
Change-Id: Id5ec87873a34a7c27f1b90209385884196efae1d
2023-09-06 17:26:18 +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
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
Treehugger Robot
4935f7c831
Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184
Change-Id: I57a146163061e0fc6f596972f809485a1e1dd543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:11:11 +00:00
Treehugger Robot
4de7df1c5e
Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev
2023-08-21 21:20:40 +00:00
Lokesh Kumar Goel
c2ee41a877
Update felix SVN to 25 am: f538f8e771
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880
Change-Id: I73ce1d8dd4bc99d5dbb1022b941a4b09e492a197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 22:56:27 +00:00
Lokesh Kumar Goel
e5cfad4616
Update felix SVN to 24 am: 0368e3e821
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24426027
Change-Id: I4441d987204814cc9cb093693dc54cfdc9c12014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 06:20:13 +00:00
Lokesh Kumar Goel
f538f8e771
Update felix SVN to 25
...
Bug: 295937899
Change-Id: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
2023-08-16 05:39:45 +00:00
Lokesh Kumar Goel
0368e3e821
Update felix SVN to 24
...
Bug: 295937899
Change-Id: I64164674d19b1e7d49094fed2175ec7c63f9ad82
2023-08-15 00:11:52 +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
Bassem Khalife
3dd8086a92
Update felix SVN to 23 am: 4ecf2187a2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24394073
Change-Id: I4663a5f7a4f5503ed6a9a2c4bf8bf5c2b5e582e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 04:57:56 +00:00
Bassem Khalife
4ecf2187a2
Update felix SVN to 23
...
Bug: 289414927
Change-Id: I3f4936d26b869ca400be05386fc009d95cf003c2
2023-08-10 19:58:11 +00:00
Bassem Khalife
e07c0cc9f4
Update felix SVN to 22 am: 64da307f5f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24374051
Change-Id: I5aa534202eba0ac46817cb6154b5101d85fd6cc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 06:09:42 +00:00
Bassem Khalife
64da307f5f
Update felix SVN to 22
...
Bug: 289414927
Change-Id: I4890e0ed2191993887aa550053a827c2aca3aafe
2023-08-09 18:11:30 +00:00
Treehugger Robot
abc08b5f71
Merge "Revert "Revert "Update felix SVN to 21""" into udc-dev am: ccf9987230
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24338862
Change-Id: I1ff146bba46330b77a958677c9943c51d4a02766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-06 23:34:39 +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
Treehugger Robot
ccf9987230
Merge "Revert "Revert "Update felix SVN to 21""" into udc-dev
2023-08-06 22:50:33 +00:00
Neha Jain
5ee36bd203
Revert "Revert "Update felix SVN to 21""
...
This reverts commit b6fc908043
.
Reason for revert: Need the SVN for F10 KDDI build
Bug: 289414927
Change-Id: I09e8877ac2325a0056c931ce01602fffb7e68c35
2023-08-06 22:07:17 +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
Treehugger Robot
a7c821840c
Merge "Revert "Update felix SVN to 21"" into udc-dev am: 9e3aa97625
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24288899
Change-Id: I9d41f856c0559055866bf4b3a3e7fafd228e6a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 03:13:55 +00:00
Treehugger Robot
9e3aa97625
Merge "Revert "Update felix SVN to 21"" into udc-dev
2023-08-02 02:22:31 +00:00
Neha Jain
b6fc908043
Revert "Update felix SVN to 21"
...
This reverts commit 29203a354d
.
Reason for revert: b/289414927
Bug: 289414927
Change-Id: I37230a6d768bd2293b7c9fb4bf9659b9a31f5ae8
2023-08-02 02:22:17 +00:00
Android Build Coastguard Worker
bf8b107751
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24257623'] into udc-release.
...
Change-Id: I9ccf275ed07251d797187748e88acfae8fa3c321
2023-08-01 01:09:53 +00:00
Shawn Lin
227e1a2bf7
Fix layout issue of pattern set up page in F10
...
Set the pattern view size to 290dp for F10
Bug: 285290323
Bug: 290721507
Test: manual
Test: Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=\
SetupChooseLockPatternTest
(cherry picked from commit f3e62f0321
)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:84485a4bded56ebfa94fd95120820cec40048854 )
Merged-In: I0bd45ad6f793afdec96ffd4a538539d040ad4993
Change-Id: I0bd45ad6f793afdec96ffd4a538539d040ad4993
2023-08-01 01:09:20 +00:00
Shawn Lin
28ea5128bf
Fix layout issue of pattern set up page in F10 am: 84485a4bde
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24257623
Change-Id: Iedb1bc1581a521deee3b09524fa45b9915d71af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 19:11:58 +00:00
Shawn Lin
84485a4bde
Fix layout issue of pattern set up page in F10
...
Set the pattern view size to 290dp for F10
Bug: 285290323
Bug: 290721507
Test: manual
Test: Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=\
SetupChooseLockPatternTest
Change-Id: I0bd45ad6f793afdec96ffd4a538539d040ad4993
(cherry picked from commit f3e62f0321
)
2023-07-31 04:22:11 +00:00
Android Build Coastguard Worker
c0d906538e
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24185697'] into udc-release.
...
Change-Id: I4c3d2ba905b9e8944b4821c444a29d2c86f2c440
2023-07-29 06:36:30 +00:00
Bassem Khalife
35d0c6ce8f
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-07-29 06:35:19 +00:00
Edwin Tung
c9015ef36b
gps: Disable Vzw SUPL OTDOA
...
Bug: 293213801
Test: OTDOA disabled
Change-Id: I402e5c6e0cb54eb0596cf846483b63d356992b65
2023-07-27 13:45:18 +08:00