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
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
Shivakumar Neginal
ec518897c2
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
Change-Id: I29599f388b0689db5e105d00ccf9f4bbfde9d84a
2023-10-26 22:55:38 +00:00
Lokesh Kumar Goel
47cc3ff89f
Update panther SVN to 36 am: 59025a6c83
am: 82580c644d
am: 0ef04a6f95
am: 3b1d29c929
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369
Change-Id: I79f23cae36881408ca691d0aa447ee048aa86e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:22:37 +00:00
Lokesh Kumar Goel
a9bfeac0f1
Update cheetah SVN to 36 am: 92a618d04f
am: fbab23735f
am: 1375935ffd
am: ac656e3334
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368
Change-Id: I18df72a378d96e66c8b1185df83634e2eb648567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:22:30 +00:00
Lokesh Kumar Goel
989abaa7e8
[automerger skipped] Update cheetah SVN to 35 am: 7e02c7f28a
am: f9b2824191
-s ours am: 80a786f706
-s ours am: ebff7bb2fb
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175439
Change-Id: I561bc25e1649e80e339f9880f159c46f56c9993a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:21:57 +00:00
Lokesh Kumar Goel
aae1c07984
[automerger skipped] Update panther SVN to 35 am: 2a2884b47c
am: 03f3449968
-s ours am: 353714f18e
-s ours am: 48e5158686
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175438
Change-Id: Ibc4bce94e3fe7fb0e962a1aea7fe319ab79b18b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:21:52 +00:00
Lokesh Kumar Goel
c9b2f95ff2
Update panther SVN to 36 am: 59025a6c83
am: 2ef063fea3
am: be9dcfd752
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369
Change-Id: Iccb8545b3dea513e878cf372e49dfef70e2ebd4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:19:47 +00:00
Lokesh Kumar Goel
ec3f839641
Update cheetah SVN to 36 am: 92a618d04f
am: 8de7f8b190
am: 8702b3bbea
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368
Change-Id: I26c369bf2557bb8e16727f2e5feb5ac29dd04f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:19:41 +00:00
Lokesh Kumar Goel
7bc678f3f8
[automerger skipped] Update cheetah SVN to 35 am: 7e02c7f28a
am: 9ebeab8dbf
-s ours am: 0e4f5d2d5c
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175439
Change-Id: I86152354d6957ad88bc7debe095d1b53790d6bfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:56:46 +00:00
Lokesh Kumar Goel
447363c2b7
[automerger skipped] Update panther SVN to 35 am: 2a2884b47c
am: 10b98107de
-s ours am: c89c6d858e
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175438
Change-Id: I5bb8f6d94de3130f2e4e7754470f0d48bc1c3d34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:56:38 +00:00
Lokesh Kumar Goel
3b1d29c929
Update panther SVN to 36 am: 59025a6c83
am: 82580c644d
am: 0ef04a6f95
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369
Change-Id: I645b4fcb6692c67aedafb74070c9bb3e2ec5dcb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:37 +00:00
Lokesh Kumar Goel
ac656e3334
Update cheetah SVN to 36 am: 92a618d04f
am: fbab23735f
am: 1375935ffd
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368
Change-Id: Ia9c5c292626c325b387ca9e5e8c37bf52b18a15d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:30 +00:00
Lokesh Kumar Goel
ebff7bb2fb
[automerger skipped] Update cheetah SVN to 35 am: 7e02c7f28a
am: f9b2824191
-s ours am: 80a786f706
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175439
Change-Id: Id9a86f41c9997a4e7d97440c646103d68e0ae202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:05 +00:00
Lokesh Kumar Goel
48e5158686
[automerger skipped] Update panther SVN to 35 am: 2a2884b47c
am: 03f3449968
-s ours am: 353714f18e
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175438
Change-Id: Iab408c2fcb4d8c812de551be8f7cfbbd2ea558eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:54:58 +00:00
Lokesh Kumar Goel
be9dcfd752
Update panther SVN to 36 am: 59025a6c83
am: 2ef063fea3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369
Change-Id: Iadbb9457efe2fc59119cca85ff6c9d032802a5be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:33:22 +00:00
Lokesh Kumar Goel
8702b3bbea
Update cheetah SVN to 36 am: 92a618d04f
am: 8de7f8b190
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368
Change-Id: I558e6902f51dfac85a35e9b11aaad77697ac9bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:33:15 +00:00
Lokesh Kumar Goel
0e4f5d2d5c
[automerger skipped] Update cheetah SVN to 35 am: 7e02c7f28a
am: 9ebeab8dbf
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175439
Change-Id: I367b34f6189d323dfdec3250300508399c51a33f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:32:43 +00:00
Lokesh Kumar Goel
c89c6d858e
[automerger skipped] Update panther SVN to 35 am: 2a2884b47c
am: 10b98107de
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175438
Change-Id: I94c94513e4e67fc5f89431d9650e606858d68c9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:32:36 +00:00
Lokesh Kumar Goel
c09096ca1f
Update panther SVN to 36 am: 59025a6c83
am: 82652e5176
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369
Change-Id: Ia452d9643bb2aaaea89e66a7e1461d4602261e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:29:59 +00:00
Lokesh Kumar Goel
42a0ba3450
Update cheetah SVN to 36 am: 92a618d04f
am: 551cdcc08b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368
Change-Id: I7a71235a328e287c0817c8e80cd42d927bc42882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:29:53 +00:00
Lokesh Kumar Goel
303ddc36df
[automerger skipped] Update cheetah SVN to 35 am: 7e02c7f28a
am: 27ed37f0b2
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175439
Change-Id: I3d13d405107e977a7c317c0ff16f686751d656ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:29:07 +00:00
Lokesh Kumar Goel
bc77676bbd
[automerger skipped] Update panther SVN to 35 am: 2a2884b47c
am: 21bab2c750
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175438
Change-Id: I45a0782d78ea16101d81d1edfea3bdbb5a349716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:28:59 +00:00
Lokesh Kumar Goel
0ef04a6f95
Update panther SVN to 36 am: 59025a6c83
am: 82580c644d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369
Change-Id: I46232df6bd94b2702052179103d44fac53b60111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:45 +00:00
Lokesh Kumar Goel
1375935ffd
Update cheetah SVN to 36 am: 92a618d04f
am: fbab23735f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368
Change-Id: Ie204a353d591fcff5232c13c14c9130ed1114c6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:39 +00:00