Roshan Pius
ec0193c9ee
Merge "pantah: Replace NFC app with NFC apex" into main am: 6ae13c6320
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2779408
Change-Id: Ic22f490f61345c12ef362e794e0569e07c414542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:15:57 +00:00
Roshan Pius
6ae13c6320
Merge "pantah: Replace NFC app with NFC apex" into main
2023-10-16 18:31:03 +00:00
Roshan Pius
f57890377e
pantah: Replace NFC app with NFC apex
...
Bug: 303286040
Test: Compiles
Merged-In: Ifb1a5c4f685818fbfe816342e44487aa76528078
Change-Id: Ifb1a5c4f685818fbfe816342e44487aa76528078
2023-10-13 18:05:42 +00:00
Cole Faust
ea80bf7c80
Use PRODUCT_COPY_FILES to install uwb country files am: 751d9f1935
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2777395
Change-Id: I8c2747469413f6359aafe88148dd320bb07c751d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 17:45:52 +00:00
Cole Faust
751d9f1935
Use PRODUCT_COPY_FILES to install uwb country files
...
Previously, these files were installed with a custom $(shell) command
in an Android.mk file. This doesn't let the build system know that
these files exist, and breaks hermetic partition builds.
Instead, install them with PRODUCT_COPY_FILES, and add a check that
the list is up-to-date.
Bug: 205632228
Test: Presubmits
Change-Id: I54c1d5600432b3ecc8a9a924f6cde311dc3b41fd
2023-10-10 23:20:39 -07:00
Xin Li
e7be45f86d
[automerger skipped] Merge Android 14 am: 1fc898784c
-s ours
...
am skip reason: Merged-In I90c6f1cf423baf2f5ca42440b5e020f005360f49 with SHA-1 e28ced4930
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2775026
Change-Id: I0851b0c3fd26bd0e766f59ca55e710a161e95857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:51:45 +00:00
Xin Li
1fc898784c
Merge Android 14
...
Bug: 298295554
Merged-In: I90c6f1cf423baf2f5ca42440b5e020f005360f49
Change-Id: I875ce791fde6a4de0d1ec3fd0cee114af95f15fb
2023-10-05 15:34:06 -07:00
Xin Li
d7ea227974
Merge UP1A.231005.007
...
Bug: 291102124
Merged-In: I83852b7c11925d054ef38442f3cbd564c59866a2
Change-Id: I0c04b64f69f82922f91e82fb1dbbcf973ec15051
2023-09-27 16:04:30 -07:00
Xin Li
e28ced4930
Set the blew prebuilt apps to PRESIGNED
...
Keep PixelQualifiedNetworksService platfrom key
Other apps are no need to re-sign
Bug: 290766628
Change-Id: I90c6f1cf423baf2f5ca42440b5e020f005360f49
2023-09-23 03:37:58 +00:00
Xin Li
823755b30e
Merge UP1A.230905.019
...
Merged-In: I52424c33d2390294512a796bd1db963e32ffa350
Change-Id: I3e4ff648854a82b8dfea903b38ada044fdad6493
2023-08-31 12:18:29 -07:00
Android Build Coastguard Worker
5f4ceca888
[coastguard skipped] Merge sparse cherrypicks from sparse-10740638-L17800000962853027 into udc-release.
...
COASTGUARD_SKIP: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
COASTGUARD_SKIP: I123fc9afcd125fbfdc38f6a899d2016b141083b8
COASTGUARD_SKIP: I83852b7c11925d054ef38442f3cbd564c59866a2
Change-Id: I0eb1016cd5d46ce88182e80ba6a34e7ea4a445b0
2023-08-30 23:17:41 +00:00
Android Build Coastguard Worker
301b0ad6d2
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24441087', 'googleplex-android-review.googlesource.com/24440079'] into sparse-10740638-L17800000962853027.
...
SPARSE_CHANGE: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
SPARSE_CHANGE: I83852b7c11925d054ef38442f3cbd564c59866a2
Change-Id: I123fc9afcd125fbfdc38f6a899d2016b141083b8
2023-08-30 23:10:28 +00:00
Lokesh Kumar Goel
254fd674a1
Update panther SVN to 32
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ce0e01fc1afebbd6d35c0b91dc2861974ee94edc )
Merged-In: I83852b7c11925d054ef38442f3cbd564c59866a2
Change-Id: I83852b7c11925d054ef38442f3cbd564c59866a2
2023-08-30 23:08:57 +00:00
Lokesh Kumar Goel
7cbb9f04e9
Update cheetah SVN to 32
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d2ea95af0032b5985b2eb964e2772c80aa4dff4b )
Merged-In: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
Change-Id: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
2023-08-30 23:08:48 +00:00
Android Build Coastguard Worker
c851f0efb3
[coastguard skipped] Merge sparse cherrypicks from sparse-10739010-L93800000962847818 into udc-release.
...
COASTGUARD_SKIP: I83852b7c11925d054ef38442f3cbd564c59866a2
COASTGUARD_SKIP: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
COASTGUARD_SKIP: Icac92b9daf576d0849a0a2077af4a36cbc6a7b65
Change-Id: I8e7a78b3609899a06628fbd959d9d0094dcdcba7
2023-08-30 18:58:14 +00:00
Android Build Coastguard Worker
0674969b9e
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24441087', 'googleplex-android-review.googlesource.com/24440079'] into sparse-10739010-L93800000962847818.
...
SPARSE_CHANGE: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
SPARSE_CHANGE: I83852b7c11925d054ef38442f3cbd564c59866a2
Change-Id: Icac92b9daf576d0849a0a2077af4a36cbc6a7b65
2023-08-30 18:50:53 +00:00
Lokesh Kumar Goel
dedb943acd
Update panther SVN to 32
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ce0e01fc1afebbd6d35c0b91dc2861974ee94edc )
Merged-In: I83852b7c11925d054ef38442f3cbd564c59866a2
Change-Id: I83852b7c11925d054ef38442f3cbd564c59866a2
2023-08-30 18:49:10 +00:00
Lokesh Kumar Goel
66b7ebc849
Update cheetah SVN to 32
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d2ea95af0032b5985b2eb964e2772c80aa4dff4b )
Merged-In: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
Change-Id: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
2023-08-30 18:49:00 +00:00
Android Build Coastguard Worker
3a06a55655
[coastguard skipped] Merge sparse cherrypicks from sparse-10705648-L70200000962736881 into udc-release.
...
COASTGUARD_SKIP: I83852b7c11925d054ef38442f3cbd564c59866a2
COASTGUARD_SKIP: I67e6f80b12287f450bf7d98b5890dc45d327d89c
COASTGUARD_SKIP: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
Change-Id: I0386e8166c390e9eeab7bdf09da4e95748b306b1
2023-08-23 23:45:57 +00:00
Android Build Coastguard Worker
59a4b8ce7e
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24441087', 'googleplex-android-review.googlesource.com/24440079'] into sparse-10705648-L70200000962736881.
...
SPARSE_CHANGE: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
SPARSE_CHANGE: I83852b7c11925d054ef38442f3cbd564c59866a2
Change-Id: I67e6f80b12287f450bf7d98b5890dc45d327d89c
2023-08-23 23:40:44 +00:00
Lokesh Kumar Goel
c1eba80c11
Update panther SVN to 32
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ce0e01fc1afebbd6d35c0b91dc2861974ee94edc )
Merged-In: I83852b7c11925d054ef38442f3cbd564c59866a2
Change-Id: I83852b7c11925d054ef38442f3cbd564c59866a2
2023-08-23 23:39:26 +00:00
Lokesh Kumar Goel
93811f9b9a
Update cheetah SVN to 32
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d2ea95af0032b5985b2eb964e2772c80aa4dff4b )
Merged-In: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
Change-Id: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
2023-08-23 23:39:18 +00:00
Android Build Coastguard Worker
9548737e42
[coastguard skipped] Merge sparse cherrypicks from sparse-10696112-L14300000962710292 into udc-release.
...
COASTGUARD_SKIP: I187768fa30e4cb4a9e5e8a861a67512a9763fe34
COASTGUARD_SKIP: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
COASTGUARD_SKIP: I83852b7c11925d054ef38442f3cbd564c59866a2
Change-Id: Ida2b0615a33fd5dcc1b625bcd367446b5db52053
2023-08-22 21:16:37 +00:00
Android Build Coastguard Worker
ec36e58f76
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24441087', 'googleplex-android-review.googlesource.com/24440079'] into sparse-10696112-L14300000962710292.
...
SPARSE_CHANGE: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
SPARSE_CHANGE: I83852b7c11925d054ef38442f3cbd564c59866a2
Change-Id: I187768fa30e4cb4a9e5e8a861a67512a9763fe34
2023-08-22 21:11:25 +00:00
Lokesh Kumar Goel
09d77b7c73
Update panther SVN to 32
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ce0e01fc1afebbd6d35c0b91dc2861974ee94edc )
Merged-In: I83852b7c11925d054ef38442f3cbd564c59866a2
Change-Id: I83852b7c11925d054ef38442f3cbd564c59866a2
2023-08-22 21:09:55 +00:00
Lokesh Kumar Goel
c8577dbf14
Update cheetah SVN to 32
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d2ea95af0032b5985b2eb964e2772c80aa4dff4b )
Merged-In: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
Change-Id: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
2023-08-22 21:09:46 +00:00
Android Build Coastguard Worker
7970c06df9
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24392566', 'googleplex-android-review.googlesource.com/24392565', 'googleplex-android-review.googlesource.com/24425914', 'googleplex-android-review.googlesource.com/24426008', 'googleplex-android-review.googlesource.com/24212388'] into udc-release.
...
Change-Id: If3d1eca3fdfe8ff2b751e773b9feeb2a9bb588c6
2023-08-22 02:19:05 +00:00
Edwin Tung
c58211f2e7
gps: Disable Vzw SUPL OTDOA
...
Bug: 293213801
Test: OTDOA disabled
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:95eefc6f32e88beda3a5e862ee5e5d560ac8a231 )
Merged-In: I65b09dd2c0a0154a765218daa42f8ef6905bcf92
Change-Id: I65b09dd2c0a0154a765218daa42f8ef6905bcf92
2023-08-22 02:09:15 +00:00
Lokesh Kumar Goel
182b9db736
Update cheetah SVN to 31
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4ae7e08a40af771631288df814e8b807eb16d855 )
Merged-In: I95e72852e47c578c1b6fcc1c7be2bba9986f85d1
Change-Id: I95e72852e47c578c1b6fcc1c7be2bba9986f85d1
2023-08-22 02:09:07 +00:00
Lokesh Kumar Goel
9ebb83dc98
Update panther SVN to 31
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:570b3d6c1f12ec5609a6a6833b95d495374112d9 )
Merged-In: I24aca791a53e22a936154123390d608cc4c4dffa
Change-Id: I24aca791a53e22a936154123390d608cc4c4dffa
2023-08-22 02:08:56 +00:00
Bassem Khalife
0f9ef1b294
Update panther SVN to 30
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:015cd3bc50168e8bc2039097f123aa2b26093fb5 )
Merged-In: I52424c33d2390294512a796bd1db963e32ffa350
Change-Id: I52424c33d2390294512a796bd1db963e32ffa350
2023-08-22 02:08:48 +00:00
Bassem Khalife
a5401dbe46
Update cheetah SVN to 30
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e18ad19f223e011e70a5dbc082587ac9e9179f0 )
Merged-In: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b
Change-Id: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b
2023-08-22 02:08:40 +00:00
Android Build Coastguard Worker
6086d2c427
[coastguard skipped] Merge sparse cherrypicks from sparse-10685236-L11100000962655815 into udc-release.
...
COASTGUARD_SKIP: I52424c33d2390294512a796bd1db963e32ffa350
COASTGUARD_SKIP: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b
COASTGUARD_SKIP: I30937e9c122d5a9e2329a38229a112082324bdec
Change-Id: I2dbb109ac264ec5beadf60b40f3b2e5e00a7c099
2023-08-20 07:52:38 +00:00
Android Build Coastguard Worker
b89c992c6f
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24392566', 'googleplex-android-review.googlesource.com/24392565'] into sparse-10685236-L11100000962655815.
...
SPARSE_CHANGE: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b
SPARSE_CHANGE: I52424c33d2390294512a796bd1db963e32ffa350
Change-Id: I30937e9c122d5a9e2329a38229a112082324bdec
2023-08-20 07:45:17 +00:00
Bassem Khalife
1f3947c69c
Update panther SVN to 30
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:015cd3bc50168e8bc2039097f123aa2b26093fb5 )
Merged-In: I52424c33d2390294512a796bd1db963e32ffa350
Change-Id: I52424c33d2390294512a796bd1db963e32ffa350
2023-08-20 07:44:44 +00:00
Bassem Khalife
11191a4102
Update cheetah SVN to 30
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e18ad19f223e011e70a5dbc082587ac9e9179f0 )
Merged-In: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b
Change-Id: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b
2023-08-20 07:44:38 +00:00
Xin Li
3390e0eddd
Merge Android U (ab/10368041)
...
Bug: 291102124
Merged-In: Ic2c4b15ec5e48d9f8d1edc3528d26b1451349e5f
Change-Id: I326626d13b3301e42d09149535c079c3a31ca283
2023-08-14 15:34:13 -07:00
Android Build Coastguard Worker
0cc304d45a
[coastguard skipped] Merge sparse cherrypicks from sparse-10656238-L15800000962566969 into udc-release.
...
COASTGUARD_SKIP: I52424c33d2390294512a796bd1db963e32ffa350
COASTGUARD_SKIP: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b
COASTGUARD_SKIP: I228fade6bc23254eeb1c2d3cbb8d4ead01d75e9f
Change-Id: Ic66e24717bab3e529ac9a7699a88a2c1f5f74d96
2023-08-14 21:47:14 +00:00
Android Build Coastguard Worker
450e0a86ca
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24392566', 'googleplex-android-review.googlesource.com/24392565'] into sparse-10656238-L15800000962566969.
...
SPARSE_CHANGE: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b
SPARSE_CHANGE: I52424c33d2390294512a796bd1db963e32ffa350
Change-Id: I228fade6bc23254eeb1c2d3cbb8d4ead01d75e9f
2023-08-14 21:43:04 +00:00
Bassem Khalife
a1424fd676
Update panther SVN to 30
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:015cd3bc50168e8bc2039097f123aa2b26093fb5 )
Merged-In: I52424c33d2390294512a796bd1db963e32ffa350
Change-Id: I52424c33d2390294512a796bd1db963e32ffa350
2023-08-14 21:41:59 +00:00
Bassem Khalife
ce4c12ed11
Update cheetah SVN to 30
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e18ad19f223e011e70a5dbc082587ac9e9179f0 )
Merged-In: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b
Change-Id: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b
2023-08-14 21:41:50 +00:00
Android Build Coastguard Worker
54c28d6ca9
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24336393', 'googleplex-android-review.googlesource.com/24336394', 'googleplex-android-review.googlesource.com/24373806', 'googleplex-android-review.googlesource.com/24373807'] into udc-release.
...
Change-Id: I4d133e2a83af7166f6ce9969f7e9c85655193442
2023-08-14 19:53:09 +00:00
Bassem Khalife
4870fda0e1
Update cheetah SVN to 29
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5c4d787b20f294e4f33e1788013c158d97a4ad2f )
Merged-In: I2b4e47655792f1772fe9f04d3d85730664d50e0e
Change-Id: I2b4e47655792f1772fe9f04d3d85730664d50e0e
2023-08-14 19:52:15 +00:00
Bassem Khalife
5f84bb10e9
Update panther SVN to 29
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fcc94dbbba4cced0058a7bb1ccbaae1a3e111f08 )
Merged-In: I32e95791efd794fef0ceb0152ccd7d35acc9c3af
Change-Id: I32e95791efd794fef0ceb0152ccd7d35acc9c3af
2023-08-14 19:52:08 +00:00
Bassem Khalife
14e3b34089
Update cheetah SVN to 28
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f0a40932f9b8c6f454322a92c4c0ab8b5da70f24 )
Merged-In: I6739a8657ef0421cfb6389d52a00085598461734
Change-Id: I6739a8657ef0421cfb6389d52a00085598461734
2023-08-14 19:52:00 +00:00
Bassem Khalife
82b36361ba
Update panther SVN to 28
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6cc298fce7a0f3dea6b1b69afa62660c20e4da8a )
Merged-In: Ic75f8b0cc00bedcf39215ef22afcf2ba2bd2c53b
Change-Id: Ic75f8b0cc00bedcf39215ef22afcf2ba2bd2c53b
2023-08-14 19:51:52 +00:00
Android Build Coastguard Worker
75a49a4f41
[coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L97000000962543233 into udc-release.
...
COASTGUARD_SKIP: I2b1492e28e7d40410b30b05df78834aca40c900d
COASTGUARD_SKIP: Ic75f8b0cc00bedcf39215ef22afcf2ba2bd2c53b
COASTGUARD_SKIP: I6739a8657ef0421cfb6389d52a00085598461734
Change-Id: I4ece4e0e812ceba70ce2d1a93d75a1570cf93d9f
2023-08-11 23:58:30 +00:00
Android Build Coastguard Worker
83e842ea53
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24336393', 'googleplex-android-review.googlesource.com/24336394'] into sparse-10644925-L97000000962543233.
...
SPARSE_CHANGE: Ic75f8b0cc00bedcf39215ef22afcf2ba2bd2c53b
SPARSE_CHANGE: I6739a8657ef0421cfb6389d52a00085598461734
Change-Id: I2b1492e28e7d40410b30b05df78834aca40c900d
2023-08-11 23:53:20 +00:00
Bassem Khalife
9dabbe6ee6
Update cheetah SVN to 28
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f0a40932f9b8c6f454322a92c4c0ab8b5da70f24 )
Merged-In: I6739a8657ef0421cfb6389d52a00085598461734
Change-Id: I6739a8657ef0421cfb6389d52a00085598461734
2023-08-11 23:52:57 +00:00
Bassem Khalife
96f08f8063
Update panther SVN to 28
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6cc298fce7a0f3dea6b1b69afa62660c20e4da8a )
Merged-In: Ic75f8b0cc00bedcf39215ef22afcf2ba2bd2c53b
Change-Id: Ic75f8b0cc00bedcf39215ef22afcf2ba2bd2c53b
2023-08-11 23:52:51 +00:00