Ankur Bakshi
0fd147e544
Update panther SVN to 39
...
Bug: 309529736
Change-Id: Ifb27544932f89b0e2fd3acfb63316af9a7dd2109
2023-11-16 03:41:42 +00:00
Ankur Bakshi
ea419cb1ae
Update cheetah SVN to 39
...
Bug: 309529736
Change-Id: I6aa90a8ebddb1eab4c26a361569643ce5ed665fe
2023-11-16 03:41:42 +00:00
Ankur Bakshi
0452b56f70
Update panther SVN to 38 am: 2b4350d830
am: 4c408c5e21
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25291798
Change-Id: Ifa70ce329ec29bc52efe1ef190008be62de55447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 02:10:36 +00:00
Ankur Bakshi
5e1ca9f831
Update cheetah SVN to 38 am: deb295c2de
am: e3b7a96fe2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25293133
Change-Id: Id95424f125dd0fab8d27e391400d0b4f604b30cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 02:10:29 +00:00
Ankur Bakshi
4c408c5e21
Update panther SVN to 38 am: 2b4350d830
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25291798
Change-Id: I994bb7c6dd6e188303029c12cb611371e3d5d88a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 01:39:09 +00:00
Ankur Bakshi
e3b7a96fe2
Update cheetah SVN to 38 am: deb295c2de
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25293133
Change-Id: If9aad1560c7d2003e00f5f515211c771c068784e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 01:39:02 +00:00
Ankur Bakshi
2b4350d830
Update panther SVN to 38
...
Bug: 302612466
Change-Id: I34ce3669c65639ee5059b181a098ef951b51ca74
2023-11-11 00:56:31 +00:00
Ankur Bakshi
deb295c2de
Update cheetah SVN to 38
...
Bug: 302612466
Change-Id: I7a139e86b6773d68e483dc5cb8182355d691fb61
2023-11-10 23:17:59 +00:00
Roshan Pius
0110b9967a
[automerger skipped] Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc
am: e699a8c761
-s ours am: f78b5c3137
-s ours
...
am skip reason: Merged-In Idced173f9063bed7899354d20553b3694579329a with SHA-1 6d7b0b8cec
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127
Change-Id: I4f4883b1d1fcd1df5747b266a5a9b6887efafcd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:34:42 +00:00
Roshan Pius
d23f6546ed
[automerger skipped] Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
am: 05035f8f52
am: 0879831a4f
-s ours
...
am skip reason: Merged-In I9adf4d5adf38a986fb95ca43e307914ae7439394 with SHA-1 3000cdee0e
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: I1058fb45e50ee67bbe2457d2aead1fbc6a9b8f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:34:23 +00:00
Roshan Pius
7722c5a079
[automerger skipped] Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc
am: b21db32598
am: a70f5a11f5
-s ours
...
am skip reason: Merged-In Idced173f9063bed7899354d20553b3694579329a with SHA-1 08fbfb05f1
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127
Change-Id: Icdb27ffc153cedd0ac6c3ac255352a38dc0fe35b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:30:58 +00:00
Roshan Pius
93e4b95cde
[automerger skipped] Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
am: 8797f7365c
am: 1989eb2ad4
-s ours
...
am skip reason: Merged-In I9adf4d5adf38a986fb95ca43e307914ae7439394 with SHA-1 3000cdee0e
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: I1d6ea3e88b87e7ddd7cf3832ed6f88e9d39df944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:30:36 +00:00
Roshan Pius
f78b5c3137
[automerger skipped] Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc
am: e699a8c761
-s ours
...
am skip reason: Merged-In Idced173f9063bed7899354d20553b3694579329a with SHA-1 6d7b0b8cec
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127
Change-Id: I762d0e4b8dbad34068becad59beb9ba576183fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:58 +00:00
Roshan Pius
0879831a4f
Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
am: 05035f8f52
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: I7676ba733c665305972fb1292d0bc031d97a76cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:41 +00:00
Roshan Pius
a70f5a11f5
Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc
am: b21db32598
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127
Change-Id: I8dc4e06695dafb980ac4c1adf2f5535abf51f2bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:25 +00:00
Roshan Pius
1989eb2ad4
Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
am: 8797f7365c
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: I683fdd3e876a9e948b0f2e5bb9c863ae2b6668da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:06 +00:00
Roshan Pius
e699a8c761
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: Ie543b18d69c75dff32ebf75109c54440ebe07583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:49:09 +00:00
Roshan Pius
05035f8f52
Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: I4a5df2fe11f137be75e94dea6fc217415cfd1a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:48:53 +00: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
Poomarin Phloyphisut
66ee837817
[USB AIDL] Remove USB configuration from audio_platform_configuration.xml
...
These configs are hardcoded into audio HAL instead because it's very rarely changed.
Bug: 307439907
Test: Local Test.
Change-Id: I678d989ed60b632a7de41b0b61d6fcbfd0e6ca38
2023-11-08 11:38:40 +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
Roshan Pius
08fbfb05f1
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
(cherry picked from https://android-review.googlesource.com/q/commit:883343a5e59ad915cef349ac21c18b1470dbb777 )
Merged-In: Idced173f9063bed7899354d20553b3694579329a
Change-Id: Idced173f9063bed7899354d20553b3694579329a
2023-11-06 14:30:47 +00:00
Roshan Pius
3000cdee0e
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
Change-Id: I9adf4d5adf38a986fb95ca43e307914ae7439394
Test: Compiles, device boots up
2023-11-06 14:30:47 +00:00
Greg Kaiser
2792415517
[automerger skipped] Fix lunch choices for git_main am: 5e34e006c3
am: b4426c3690
-s ours am: 345b2803e0
-s ours
...
am skip reason: Merged-In I1390f8707ed0eca0bf51112eef4b2cc4328e52a8 with SHA-1 5e34e006c3
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163
Change-Id: I2871fc42d04cf1b38dc80402d825e9756e212dd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:15:23 +00:00
Greg Kaiser
bfe8741bab
[automerger skipped] Fix lunch choices for git_main am: 5e34e006c3
am: ba708323ef
am: e2fb70f5d0
-s ours
...
am skip reason: Merged-In I1390f8707ed0eca0bf51112eef4b2cc4328e52a8 with SHA-1 b0fb9be930
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163
Change-Id: I517f43f0f1feca55fee799d1d95dd7ea58602c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:13:26 +00:00
Greg Kaiser
345b2803e0
[automerger skipped] Fix lunch choices for git_main am: 5e34e006c3
am: b4426c3690
-s ours
...
am skip reason: Merged-In I1390f8707ed0eca0bf51112eef4b2cc4328e52a8 with SHA-1 5e34e006c3
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163
Change-Id: Ib96236e208c5d3bd80bce21ee682b233f22e5fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:07:02 +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
e2fb70f5d0
Fix lunch choices for git_main am: 5e34e006c3
am: ba708323ef
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163
Change-Id: I4702d744ddf6dd59e99e3ef372400bbdf34a54be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:38:24 +00:00
Greg Kaiser
ba708323ef
Fix lunch choices for git_main am: 5e34e006c3
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163
Change-Id: I30a25383b6e6b14ca1d9c1335adb6566f7b8f37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:11:59 +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
Will Song
040b76b2e9
PREUPLOAD: Enforce jsonlint in preupload
...
Checks syntax and simple brace balances for all JSON files.
Test: Edit any json file and try upload
Bug: 127794899
Change-Id: I8f206409fbee40b6d0a197bb115e5a56653ebf81
2023-10-29 05:51:14 +00:00
Greg Kaiser
b0fb9be930
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
Change-Id: I1390f8707ed0eca0bf51112eef4b2cc4328e52a8
2023-10-27 14:23:38 +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
Cyan_Hsieh
3cc2927e27
Split bootloader prebuilt to 24Q1 and trunk version
...
Bug: 299879102
Change-Id: I6ba0748b82770025f585d79b8d7aba281391e38d
2023-10-27 03:05:05 +00:00
Ankur Bakshi
9277116535
Update panther SVN to 37 am: a1eee239bb
am: eef3c350f0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25181893
Change-Id: Iea2a920e7db379874411b13a911473dd63348a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:50:38 +00:00
Ankur Bakshi
a70b2bab45
Update cheetah SVN to 37 am: 9205873929
am: fe9d857f70
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176739
Change-Id: I7378e102c63f56a00b73deff927c9d989b7e5072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:49:39 +00:00
Ankur Bakshi
eef3c350f0
Update panther SVN to 37 am: a1eee239bb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25181893
Change-Id: Ia26a32b184016c3a644f660fea76d13e55002e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:19:37 +00:00
Ankur Bakshi
fe9d857f70
Update cheetah SVN to 37 am: 9205873929
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176739
Change-Id: Iad6fd94e952f6e08ec112c06fc3db9ec4e88fd2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:19:21 +00:00
Ankur Bakshi
a1eee239bb
Update panther SVN to 37
...
Bug: 302612466
Change-Id: I075a42359d9cdc1984dfb2057808fb1a9bd8e909
2023-10-27 02:06:01 +00:00
Ankur Bakshi
9205873929
Update cheetah SVN to 37
...
Bug: 302612466
Change-Id: I19ff3f5174554e51af5201ec3b5928cfaddf26f6
2023-10-27 02:02:42 +00:00
Shivakumar Neginal
0d0b25a10b
Adding Fast Pair extended IDs for Pixel 7 am: ec518897c2
am: 0f79fb5c55
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25063889
Change-Id: I76b2db398e6ff04ce8ddcd96e369dcaede4b94f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 23:52:40 +00:00
Shivakumar Neginal
0f79fb5c55
Adding Fast Pair extended IDs for Pixel 7 am: ec518897c2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25063889
Change-Id: I42a69808ffc8857f3b3b07cd589bc911f382608a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 23:22:20 +00:00