Xin Li
3ae2ebb35a
Merge Android 14 QPR1
...
Merged-In: I492d68878649c5553a7996482fda2e36e820e440
Bug: 315507370
Change-Id: I43fb967f2d0cf7032ccd54167d36be68246e1d11
2023-12-08 13:13:32 -08:00
Xin Li
4374f3bcdb
Merge UQ1A.231205.015
...
Bug: 308969284
Merged-In: I075a42359d9cdc1984dfb2057808fb1a9bd8e909
Change-Id: I492d68878649c5553a7996482fda2e36e820e440
2023-12-07 15:47:21 -08:00
Herbert Xue
01a89c3591
Remove unused Android.mk under device/google/pantah am: 01c6ee7de8
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2836176
Change-Id: I70f636709f33f14a39b30c7fe3e75e3796bbdd2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:23:54 +00:00
Herbert Xue
01c6ee7de8
Remove unused Android.mk under device/google/pantah
...
Bug: 310091213
Test: NA
Change-Id: Ib8afe342ed74ab98923da47fa248f3e91b923820
2023-11-17 11:50:01 +08:00
Roshan Pius
b21db32598
Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127
Change-Id: I25723a7f52e9b5e5a6764832ca5e11cffc316f92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:45 +00:00
Roshan Pius
8797f7365c
Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: Id6c763a588f2db2bfeadd80ceca5cff2c507ff00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:26 +00:00
Roshan Pius
6efff16bfc
Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main
2023-11-08 21:16:20 +00:00
Roshan Pius
703decc970
Revert "pantah: Replace NFC app with NFC apex"
...
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056
Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3000cdee0ef5284ba9fdc68bcdebedbcceb65b10 )
Merged-In: I9adf4d5adf38a986fb95ca43e307914ae7439394
Change-Id: I9adf4d5adf38a986fb95ca43e307914ae7439394
2023-11-08 00:18:16 +00:00
Roshan Pius
6d7b0b8cec
Revert "pantah(nfc): Modify NFC overlays for NFC apex"
...
Revert submission 2802548-nfc_apex
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:2802548-nfc_apex
Bug: 309117462
Test: Compiles, device boots up
Merged-In: Idced173f9063bed7899354d20553b3694579329a
Change-Id: Idced173f9063bed7899354d20553b3694579329a
2023-11-06 19:45:50 +00:00
Greg Kaiser
b4426c3690
Fix lunch choices for git_main am: 5e34e006c3
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163
Change-Id: Ie63f3466d4ccee30f2a6c08e65bf8afd31f16225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:40:15 +00:00
Greg Kaiser
5e34e006c3
Fix lunch choices for git_main
...
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.
Bug: 307738446
Test: lunch
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b0fb9be930027aa1664c9410697af4a4ec8ab5c3 )
Merged-In: I1390f8707ed0eca0bf51112eef4b2cc4328e52a8
Change-Id: I1390f8707ed0eca0bf51112eef4b2cc4328e52a8
2023-10-30 22:00:49 +00:00
Android Build Coastguard Worker
59580c5df3
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25176368', 'googleplex-android-review.googlesource.com/25176369', 'googleplex-android-review.googlesource.com/25063889', 'googleplex-android-review.googlesource.com/25176739', 'googleplex-android-review.googlesource.com/25181893'] into udc-qpr1-release.
...
Change-Id: I9eba05c4cfe798896db3b4f91599ac3975987ed0
2023-10-27 03:36:12 +00:00
Ankur Bakshi
4d4bede613
Update panther SVN to 37
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a1eee239bb39277c5afb0074a30c20244bf68692 )
Merged-In: I075a42359d9cdc1984dfb2057808fb1a9bd8e909
Change-Id: I075a42359d9cdc1984dfb2057808fb1a9bd8e909
2023-10-27 03:33:08 +00:00
Ankur Bakshi
19c3062b80
Update cheetah SVN to 37
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9205873929d4f1afe7a09c4f322fa7bbeb18fd98 )
Merged-In: I19ff3f5174554e51af5201ec3b5928cfaddf26f6
Change-Id: I19ff3f5174554e51af5201ec3b5928cfaddf26f6
2023-10-27 03:33:00 +00:00
Shivakumar Neginal
cd89e65ff3
Adding Fast Pair extended IDs for Pixel 7
...
Adding the Fast Pair extended IDs for Pixel 7 so that
Quick Start shows the right Fast Pair bottom sheet on other devices
during setup.
Bug: 305516133
Test: Manually flashed a cheetha and panther device and validated the FP
bottom sheet is displayed on a nearby other device
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ec518897c23085d558af3971154bdf09ab8256c5 )
Merged-In: I29599f388b0689db5e105d00ccf9f4bbfde9d84a
Change-Id: I29599f388b0689db5e105d00ccf9f4bbfde9d84a
2023-10-27 03:32:52 +00:00
Lokesh Kumar Goel
b851e4ef98
Update panther SVN to 36
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:59025a6c836b8eae7ec6e2f59da3f920c4e13033 )
Merged-In: I29083bb2d81f0cf11940d7f1ea2ce28922ea830e
Change-Id: I29083bb2d81f0cf11940d7f1ea2ce28922ea830e
2023-10-27 03:32:44 +00:00
Lokesh Kumar Goel
779fc5b702
Update cheetah SVN to 36
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:92a618d04ff92d8410f7d035236bac7fe5c3d537 )
Merged-In: I639d80c0b9f299cffef48fb7719cfbacc776ba45
Change-Id: I639d80c0b9f299cffef48fb7719cfbacc776ba45
2023-10-27 03:32:36 +00:00
Roshan Pius
095ecef0c7
pantah(nfc): Modify NFC overlays for NFC apex am: 3b1c277470
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2804494
Change-Id: Iaba6a784718844093646ba76a8a07fdd1cd31d73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:33:58 +00:00
Roshan Pius
3b1c277470
pantah(nfc): Modify NFC overlays for NFC apex
...
Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: Ib3098898eaffb0c86ab082814aa6fe288a37a30f
2023-10-25 14:27:25 -07:00
Xin Li
bcedce774c
Merge 10952656
...
Merged-In: I27abe7f4b532bee7182201e4ef020745309db944
Change-Id: Icbdf21bfb5d82ec8d832cd36719041ac38c69a9f
2023-10-17 10:06:41 -07:00
Android Build Coastguard Worker
9ca7c1724a
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24896511', 'googleplex-android-review.googlesource.com/24896411'] into udc-qpr1-release.
...
Change-Id: I6d30ad9adfb907e49419a5c570944fd0a5f72883
2023-10-17 02:45:32 +00:00
Lokesh Kumar Goel
e0b5b435ea
Update panther SVN to 35
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ec9b31a675ff49fc12e9a81b5a961c3c334f91e3 )
Merged-In: I8d176a2ba9ddef34449edae5df6fdfd55d346c51
Change-Id: I8d176a2ba9ddef34449edae5df6fdfd55d346c51
2023-10-17 02:41:37 +00:00
Lokesh Kumar Goel
c49f3a5968
Update cheetah SVN to 35
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a6e9460ef2d4bce86efbc3498b665fba469f232b )
Merged-In: Ib512f6ca86a5b87b2bc521f85e271d84603eb0c9
Change-Id: Ib512f6ca86a5b87b2bc521f85e271d84603eb0c9
2023-10-17 02:41:22 +00:00
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
46c80b8257
Use PRODUCT_COPY_FILES to install uwb country files am: 751d9f1935
am: ea80bf7c80
am: 51aae2f298
am: 00bbc14a66
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2777395
Change-Id: I27abe7f4b532bee7182201e4ef020745309db944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 19:47:19 +00:00
Cole Faust
00bbc14a66
Use PRODUCT_COPY_FILES to install uwb country files am: 751d9f1935
am: ea80bf7c80
am: 51aae2f298
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2777395
Change-Id: I6dbde0d57732b844255e86403371cea97bc6c0ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 19:13:08 +00:00
Cole Faust
51aae2f298
Use PRODUCT_COPY_FILES to install uwb country files am: 751d9f1935
am: ea80bf7c80
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2777395
Change-Id: I9ed917d3161e8923f6d2f5cd01ee496599ff773b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 18:17:37 +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
cdaa1ed86f
[automerger skipped] Merge Android 14 am: 1fc898784c
-s ours am: e7be45f86d
-s ours am: b527dc9f5a
-s ours am: a1681db3d8
-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: I85974b7615d2899e18e47174cef29dc3752f483a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:00:17 +00:00
Xin Li
a1681db3d8
[automerger skipped] Merge Android 14 am: 1fc898784c
-s ours am: e7be45f86d
-s ours am: b527dc9f5a
-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: Iefd6735b4ef7de0c94cd0e985561e70ddb2b6e0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:50:26 +00:00
Xin Li
b527dc9f5a
[automerger skipped] Merge Android 14 am: 1fc898784c
-s ours am: e7be45f86d
-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: Icbcdd11b2abd757f171cdaec022690b6de9019e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:58:50 +00: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
Android Build Coastguard Worker
4b51e460d1
Snap for 10909010 from 5be86751cf
to udc-qpr1-release
...
Change-Id: Iad8a45a630ede00581567182a272d7edba5e122b
2023-10-05 23:02:49 +00:00
Xin Li
1fc898784c
Merge Android 14
...
Bug: 298295554
Merged-In: I90c6f1cf423baf2f5ca42440b5e020f005360f49
Change-Id: I875ce791fde6a4de0d1ec3fd0cee114af95f15fb
2023-10-05 15:34:06 -07:00
Carter Hsu
d4a71f5713
audio: FM table check in for QPR1 am: 5be86751cf
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/24906814
Change-Id: I2fce14c7dcec77d5ed3d748999ca405bb88dbe89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 15:21:09 +00:00
Carter Hsu
5be86751cf
audio: FM table check in for QPR1
...
1. C10/P10 Bluetooth (Gene)
1. Unify all RX FENS RX_NS_LVL_CTRL to be 0x0006
2. Make RX Stereo process for VoIP call (RESERVE2-SWB)
Bug: 303349920
Test: Acoustic team verified at b/303349920#comment4
Change-Id: I6d03af768a46a348f51ab0acfe9fe0e26d1d37bb
Signed-off-by: Carter Hsu <carterhsu@google.com>
2023-10-05 01:15:23 +00:00
Xin Li
4fcee22185
[automerger skipped] Merge UP1A.231005.007 am: d7ea227974
-s ours am: b1dbe5a803
-s ours am: 0acf1b7a63
-s ours
...
am skip reason: Merged-In I83852b7c11925d054ef38442f3cbd564c59866a2 with SHA-1 ce0e01fc1a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/24879893
Change-Id: Ic5d9cad6a50e09247c17f2d1c9c45764a9652889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 09:04:32 +00:00
Xin Li
0acf1b7a63
[automerger skipped] Merge UP1A.231005.007 am: d7ea227974
-s ours am: b1dbe5a803
-s ours
...
am skip reason: Merged-In I83852b7c11925d054ef38442f3cbd564c59866a2 with SHA-1 ce0e01fc1a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/24879893
Change-Id: I8ffda625e822bb484fa5f7193903a38466760236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 08:16:29 +00:00
Xin Li
b1dbe5a803
[automerger skipped] Merge UP1A.231005.007 am: d7ea227974
-s ours
...
am skip reason: Merged-In I83852b7c11925d054ef38442f3cbd564c59866a2 with SHA-1 ce0e01fc1a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/24879893
Change-Id: Ib16c02ceb6df7de299e5a834a17366949e5f3271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:15:40 +00: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
77e3c8c77c
Set the blew prebuilt apps to PRESIGNED am: e28ced4930
am: 086c6638c7
am: 45ead16cc5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/24839709
Change-Id: I0a60fefa0bd32e968d11a3e91dd2b3e11be7bf00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 23:28:13 +00:00
Xin Li
45ead16cc5
Set the blew prebuilt apps to PRESIGNED am: e28ced4930
am: 086c6638c7
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/24839709
Change-Id: Iec0bb069e24d0ac3f21d4e2a290aba793d5af6cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 22:47:04 +00:00
Xin Li
086c6638c7
Set the blew prebuilt apps to PRESIGNED am: e28ced4930
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/24839709
Change-Id: Ie42e81d4c17cef11e59d2596b656419f67aa827b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 21:54:20 +00: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
Android Build Coastguard Worker
c201546ca2
Snap for 10832001 from 806a2ea45b
to udc-qpr1-release
...
Change-Id: I5cb8f42c12b935656a5f7d359f81e0109fe0af7b
2023-09-19 23:03:10 +00:00
Rick Yiu
f027ec110b
Disable limiting camera_hal for LAUNCH hint am: 806a2ea45b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/24799067
Change-Id: I146569846597c661870f9a8fada5ceb7533527d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 07:57:37 +00:00
Rick Yiu
806a2ea45b
Disable limiting camera_hal for LAUNCH hint
...
If auto rotation is enabled, it will trigger LAUNCH hint while
camera is running if device rotates, which could limit camera_hal
tasks to little cores. So, disable it first until there is a new
hint for the rotation event.
Bug: 297273578
Test: build pass
Change-Id: If671b7ce95f5eafaac80298762aa40f047090ed9
2023-09-19 03:06:08 +00:00