Commit graph

1555 commits

Author SHA1 Message Date
Elliott Hughes
dd40a981da Add aosp_cheetah_hwasan.
Test: lunch aosp_cheetah_hwasan-userdebug
Change-Id: I12bb5c139fa39fed6322d32d11b0d10f617be5f6
2023-05-02 16:59:10 -07:00
Xin Li
c17ad3f29c Merge TQ2A.230405.003
Bug: 271343657
Merged-In: I7ab4f168a95f75760d12aa349ee1d98837cbf80a
Change-Id: I9c04d414f0e78f76c16f8a8166871ec1f0360a3f
2023-04-10 23:55:30 -07:00
Xin Li
f5372e5b49 Merge Android 13 QPR2
Bug: 273316506
Merged-In: Ib2bb7ecb0fcfd9022588de781802428bbd708a02
Change-Id: Ice69b4d55f9fb4480bc4b9e5ec36f615113aa45f
2023-03-13 23:09:34 -07:00
Bill Yi
3f78353b48 Add UwbVendorService blobs to Cheetah am: 32636e806b
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2480221

Change-Id: If364b82acd8d4dbc7260610fa6fed91353e280fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 23:08:16 +00:00
Bill Yi
32636e806b Add UwbVendorService blobs to Cheetah
TEST: make and flash
BUG: 272767304
Change-Id: I0c3524ebe5518b5c47d9027ae2b7f6908e774ab8
2023-03-10 10:58:40 -08:00
Android Build Coastguard Worker
f002ad6972 [coastguard skipped] Merge sparse cherrypicks from sparse-9662652-L75600000958834478 into tm-qpr2-release.
COASTGUARD_SKIP: I2541ffe05d43211859aacdea7bf1c007e44234d4
COASTGUARD_SKIP: I7ab4f168a95f75760d12aa349ee1d98837cbf80a

Change-Id: I74820c9592f42dab30bdacc3be8b19902ea0b480
2023-02-28 00:30:41 +00:00
Android Build Coastguard Worker
c30d5919dc Merge cherrypicks of ['googleplex-android-review.googlesource.com/21407907'] into sparse-9662652-L75600000958834478.
SPARSE_CHANGE: I7ab4f168a95f75760d12aa349ee1d98837cbf80a

Change-Id: I2541ffe05d43211859aacdea7bf1c007e44234d4
2023-02-28 00:21:38 +00:00
Steve Berbary
1bac3acd61 Update pantah SVN to 18
Bug: 268558932
Change-Id: I7ab4f168a95f75760d12aa349ee1d98837cbf80a
(cherry picked from commit bbbf58bd9b)
Merged-In: I7ab4f168a95f75760d12aa349ee1d98837cbf80a
2023-02-28 00:19:05 +00:00
Xin Li
b78ab50813 Merge TQ2A.230305.008
Bug: 264720040
Merged-In: Ib2bb7ecb0fcfd9022588de781802428bbd708a02
Change-Id: Ia62c29449d59bb0f77200721667506c530c27f71
2023-02-14 16:11:07 -08:00
Android Build Coastguard Worker
376f6a42ac [coastguard skipped] Merge sparse cherrypicks from sparse-9605534-L22400000958611218 into tm-qpr2-release.
COASTGUARD_SKIP: I7ab4f168a95f75760d12aa349ee1d98837cbf80a
COASTGUARD_SKIP: I77298dbdabb370f2a432c09d907948d6c72038d4

Change-Id: I0e276c72d5f82c01400b2af145ade46f295fe028
2023-02-14 18:59:20 +00:00
Android Build Coastguard Worker
eec75ce139 Merge cherrypicks of ['googleplex-android-review.googlesource.com/21407907'] into sparse-9605534-L22400000958611218.
SPARSE_CHANGE: I7ab4f168a95f75760d12aa349ee1d98837cbf80a

Change-Id: I77298dbdabb370f2a432c09d907948d6c72038d4
2023-02-14 18:52:02 +00:00
Steve Berbary
7a1bfe15c4 Update pantah SVN to 18
Bug: 268558932
Change-Id: I7ab4f168a95f75760d12aa349ee1d98837cbf80a
(cherry picked from commit bbbf58bd9b)
Merged-In: I7ab4f168a95f75760d12aa349ee1d98837cbf80a
2023-02-14 18:50:20 +00:00
Android Build Coastguard Worker
9cfe7b5ca4 Merge cherrypicks of ['googleplex-android-review.googlesource.com/21353111', 'googleplex-android-review.googlesource.com/21399916'] into tm-qpr2-release.
Change-Id: Id2674d5b293499e23c497601a94bad33d60d6276
2023-02-14 18:20:17 +00:00
Steve Berbary
b3350f7895 Update pantah SVN to 17
Bug: 268558932
Change-Id: Ib90c2c822fdd0b9adb5f0e4504979fc5ca2c4cf2
(cherry picked from commit 4b973c7de1)
Merged-In: Ib90c2c822fdd0b9adb5f0e4504979fc5ca2c4cf2
2023-02-14 18:13:48 +00:00
Steve Berbary
27059c30c1 Update pantah SVN to 16
Bug: 268558932
Change-Id: Iebaddca0f2223013119910c694bc03e3dcc0db2e
(cherry picked from commit bc6e78183b)
Merged-In: Iebaddca0f2223013119910c694bc03e3dcc0db2e
2023-02-14 18:13:45 +00:00
Android Build Coastguard Worker
c564ef67d7 [coastguard skipped] Merge sparse cherrypicks from sparse-9595452-L17000000958584414 into tm-qpr2-release.
COASTGUARD_SKIP: Iebaddca0f2223013119910c694bc03e3dcc0db2e
COASTGUARD_SKIP: I50e1dd3dc5838e01f4bf094b638385b82c9801da

Change-Id: I1ed423b6f8a23d3d53878b0b17e21c07dfe3e6e9
2023-02-13 19:34:55 +00:00
Android Build Coastguard Worker
2d7c3de792 Merge cherrypicks of ['googleplex-android-review.googlesource.com/21353111'] into sparse-9595452-L17000000958584414.
SPARSE_CHANGE: Iebaddca0f2223013119910c694bc03e3dcc0db2e

Change-Id: I50e1dd3dc5838e01f4bf094b638385b82c9801da
2023-02-13 19:28:50 +00:00
Steve Berbary
e27e6ca668 Update pantah SVN to 16
Bug: 268558932
Change-Id: Iebaddca0f2223013119910c694bc03e3dcc0db2e
(cherry picked from commit bc6e78183b)
Merged-In: Iebaddca0f2223013119910c694bc03e3dcc0db2e
2023-02-13 19:27:28 +00:00
Xin Li
4ce3ca4ea4 [automerger skipped] Merge TQ1A.230205.002 am: 44bcde571c -s ours
am skip reason: Merged-In Ibf680224ed0eba44d9003620e052c595e76d3299 with SHA-1 52392a2014 is already in history

Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2424765

Change-Id: I7e6338752a6a7a4a31601a2b3509eb7681f38ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 18:13:29 +00:00
Xin Li
44bcde571c Merge TQ1A.230205.002
Bug: 263898609
Merged-In: Ibf680224ed0eba44d9003620e052c595e76d3299
Change-Id: I2c65fab3d411041da7b069bd70433636fdd90e3d
2023-02-06 21:02:34 -08:00
Tri Vo
14b399a2c4 pantah: Enable RKPD am: 32df466fb5
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2403122

Change-Id: I645cdbf330269695426186dba53266fc377106c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-26 20:16:02 +00:00
Tri Vo
32df466fb5 pantah: Enable RKPD
Bug: 266464658
Test: CtsIdentityTestCases
Test: android.keystore.cts.KeyAttestationTest
Test: keystore2_test
Test: attestation key upgrade
Change-Id: I05be0bac35759596d4ed02416afe329efca7548e
2023-01-25 16:38:20 -08:00
Android Build Coastguard Worker
a1d3bed114 Merge cherrypicks of ['ag/20984653'] into tm-qpr2-release.
Change-Id: Ide44ec900ee84fc52693c866ee7251068b23db4d
2023-01-17 20:19:28 +00:00
Steve Berbary
74a4c505ab Update pantah SVN to 15
Bug: 265319238
Change-Id: Ib2bb7ecb0fcfd9022588de781802428bbd708a02
(cherry picked from commit 844fe2849f)
Merged-In: Ib2bb7ecb0fcfd9022588de781802428bbd708a02
2023-01-17 20:05:37 +00:00
Xin Li
e3cd604ff9 Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
Bug: 264720040
Merged-In: Ibf680224ed0eba44d9003620e052c595e76d3299
Change-Id: Id6dcf0c73be10c6636ff1b0792e7bfb26a6a1c5f
2023-01-11 22:46:19 -08:00
Android Build Coastguard Worker
3a8603d92f Snap for 9463735 from 52392a2014 to tm-qpr2-release
Change-Id: Ied864da841cf90c572725929c419e5d77c47d821
2023-01-07 02:02:53 +00:00
Steve Berbary
e8f8a90ba5 Update cheetah SVN to 14 am: 52392a2014
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/20887169

Change-Id: Iaf1d1015c609e75f0804d80718314a5719a9c7d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 21:29:27 +00:00
Steve Berbary
52392a2014 Update cheetah SVN to 14
Bug: 261738635
Change-Id: Ibf680224ed0eba44d9003620e052c595e76d3299
2023-01-06 20:47:48 +00:00
Bill Yi
1d269cdd5d [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 9cf3c4c2f0 -s ours am: ed7a03e182 -s ours
am skip reason: Merged-In I8683963e7f5a74063968d442691b4f7e49b4fa10 with SHA-1 51a33aa557 is already in history

Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2377816

Change-Id: I61d28daae31599ece7d92b0837f4f86e54a345d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:26:03 +00:00
Bill Yi
ed7a03e182 [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 9cf3c4c2f0 -s ours
am skip reason: Merged-In I8683963e7f5a74063968d442691b4f7e49b4fa10 with SHA-1 51a33aa557 is already in history

Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2377816

Change-Id: I50e8ab3286dac7095092f92dd9c0cf51447fc89d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:00:00 +00:00
Android Build Coastguard Worker
a3ca3a5a75 [coastguard skipped] Merge sparse cherrypicks from sparse-9402666-L12400000958024923 into tm-qpr1-release.
COASTGUARD_SKIP: Ibf680224ed0eba44d9003620e052c595e76d3299
COASTGUARD_SKIP: Ifd4b4d0a9e54d30cb0d0c1c296d689690a68d115
COASTGUARD_SKIP: I5ef3e24f7a95d2e60b5899b41ff28a931f4e95ce
COASTGUARD_SKIP: Ib175f29d5e46bf79447fb4e6ca14820992a2cf56

Change-Id: Ie69e1f57ffd17892b7d152b7e5034402ada5656f
2023-01-06 18:13:39 +00:00
Android Build Coastguard Worker
4f338261f4 Merge cherrypicks of ['ag/20806564', 'ag/20885506', 'ag/20887169'] into sparse-9402666-L12400000958024923.
SPARSE_CHANGE: Ib175f29d5e46bf79447fb4e6ca14820992a2cf56
SPARSE_CHANGE: Ifd4b4d0a9e54d30cb0d0c1c296d689690a68d115
SPARSE_CHANGE: Ibf680224ed0eba44d9003620e052c595e76d3299

Change-Id: I5ef3e24f7a95d2e60b5899b41ff28a931f4e95ce
2023-01-06 18:06:19 +00:00
Steve Berbary
5e03abdbe6 Update cheetah SVN to 14
Bug: 261738635
Change-Id: Ibf680224ed0eba44d9003620e052c595e76d3299
(cherry picked from commit 9982dfe67ec5fdcd5be48626507c9258f7f48eec)
Merged-In: Ibf680224ed0eba44d9003620e052c595e76d3299
2023-01-06 18:05:27 +00:00
Steve Berbary
1fc0e03911 Update panther SVN to 14
Bug: 261738635
Change-Id: Ifd4b4d0a9e54d30cb0d0c1c296d689690a68d115
(cherry picked from commit 16c49034b4)
Merged-In: Ifd4b4d0a9e54d30cb0d0c1c296d689690a68d115
2023-01-06 18:05:24 +00:00
Paul Scovanner
b8982c7aba Update panther/cheetah SVN to 13
Bug: 258811679
Change-Id: Ib175f29d5e46bf79447fb4e6ca14820992a2cf56
(cherry picked from commit a0f32357c2)
Merged-In: Ib175f29d5e46bf79447fb4e6ca14820992a2cf56
2023-01-06 18:05:21 +00:00
Bill Yi
9cf3c4c2f0 Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE
Merged-In: I8683963e7f5a74063968d442691b4f7e49b4fa10
Merged-In: I661b9803484797b1ee6f55d5edc9364729927b2c

Change-Id: I8df5df5559a92f2ee0f304bb7f7ae34ac44ba966
2023-01-06 15:30:13 +00:00
Bill Yi
0cf37f3c37 [automerger skipped] Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE am: 51a33aa557 -s ours
am skip reason: Merged-In I0e1763e01ca1ddfdf7df1a6c1ef66b4b3673a4ff with SHA-1 34c13d7b7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/20873173

Change-Id: I730bc54f7a159510f46a50a8f3249f32e874d249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 07:32:52 +00:00
Steve Berbary
2f6e98f68a Update panther SVN to 14 am: 16c49034b4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/20885506

Change-Id: I661b9803484797b1ee6f55d5edc9364729927b2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05 23:28:55 +00:00
Steve Berbary
16c49034b4 Update panther SVN to 14
Bug: 261738635
Change-Id: Ifd4b4d0a9e54d30cb0d0c1c296d689690a68d115
2023-01-05 21:30:39 +00:00
Bill Yi
51a33aa557 Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE
Merged-In: I0e1763e01ca1ddfdf7df1a6c1ef66b4b3673a4ff
Change-Id: I8683963e7f5a74063968d442691b4f7e49b4fa10
2023-01-04 11:22:02 -08:00
Android Build Coastguard Worker
8b8765a4b8 Snap for 9446458 from ea9526b9d8 to tm-qpr2-release
Change-Id: I2cd1e319189244d26d631717fd1b775d01735b57
2022-12-31 02:02:47 +00:00
Edwin Tung
34c13d7b7a gps: Enable Vzw SUPL OTDOA am: ea9526b9d8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/20836489

Change-Id: I0e1763e01ca1ddfdf7df1a6c1ef66b4b3673a4ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-30 11:53:43 +00:00
Edwin Tung
ea9526b9d8 gps: Enable Vzw SUPL OTDOA
Bug: 263852801
Test: OTDOA pass
Change-Id: I0d63975b1e7e89db7409506c29be2205f41ac5fd
2022-12-29 13:10:33 +08:00
Android Build Coastguard Worker
1c6bdb52c2 Snap for 9434600 from a0f32357c2 to tm-qpr2-release
Change-Id: Ic0484b6996c6edbf59a4813b8432c55b8ca307ce
2022-12-24 02:02:45 +00:00
Paul Scovanner
a8f22dae20 Update panther/cheetah SVN to 13 am: a0f32357c2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/20806564

Change-Id: Ib3517757a81c39cab84886631faa0b0d3f2737a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 22:48:49 +00:00
Android Build Coastguard Worker
e1e6b1c81d [coastguard skipped] Merge sparse cherrypicks from sparse-9292298-L16600000957892016 into tm-qpr1-release.
Change-Id: Iba687ea6c9385988df78cd1a3370a0b7567a2537
2022-12-22 21:54:04 +00:00
Android Build Coastguard Worker
d751d82cd8 Merge cherrypicks of ['ag/20668768', 'ag/20668907', 'ag/20806564'] into sparse-9292298-L16600000957892016.
Change-Id: I0abdea1afdb54fd7c6e67dad48033bb86a3de9a7
2022-12-22 21:42:10 +00:00
Paul Scovanner
036368ad21 Update panther/cheetah SVN to 13
Bug: 258811679
Change-Id: Ib175f29d5e46bf79447fb4e6ca14820992a2cf56
(cherry picked from commit a0f32357c2)
Merged-In: Ib175f29d5e46bf79447fb4e6ca14820992a2cf56
2022-12-22 21:40:56 +00:00
Steve Berbary
967b09258d Update panther SVN to 12
Bug: 261738635
Change-Id: I2dab618aea9c473d6e03fc14fbc605de10bad4af
(cherry picked from commit 940c750f23)
Merged-In: I2dab618aea9c473d6e03fc14fbc605de10bad4af
2022-12-22 21:40:53 +00:00
Steve Berbary
61e50ece68 Update cheetah SVN to 12
Bug: 261738635
Change-Id: I8e279259f45f257f2a73cb242bccf9de765cfb5a
(cherry picked from commit db252ccebb)
Merged-In: I8e279259f45f257f2a73cb242bccf9de765cfb5a
2022-12-22 21:40:49 +00:00