Commit graph

3600 commits

Author SHA1 Message Date
Treehugger Robot
402d34b6e9 Merge changes from topic "cherrypicker-L23200030000689269:N91700030011100373" into main am: 9e58dbf4b2 am: 077e772133
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2864191

Change-Id: I92231683fc6a954a552e3b8a8e5c8ae3fd9aa95d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:40:22 +00:00
Roshan Pius
b23abea540 Revert^2 "pantah: Replace NFC app with NFC apex" am: 61abf7319e am: 704a52bfb4
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2864190

Change-Id: Ie20fcfe3a22d9544fcb5940e4d2d901bcdda71ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:40:05 +00:00
Treehugger Robot
077e772133 Merge changes from topic "cherrypicker-L23200030000689269:N91700030011100373" into main am: 9e58dbf4b2
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2864191

Change-Id: I83187ac18ba0c729644736e97f0ff01c240a9c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:18:26 +00:00
Roshan Pius
704a52bfb4 Revert^2 "pantah: Replace NFC app with NFC apex" am: 61abf7319e
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2864190

Change-Id: I215d22735f124b86d7c14857464036cd898ac848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:18:10 +00:00
Xin Li
a40103a204 [automerger skipped] Merge Android 14 QPR1 am: 3ae2ebb35a -s ours am: c826e7064c -s ours
am skip reason: Merged-In I492d68878649c5553a7996482fda2e36e820e440 with SHA-1 4374f3bcdb is already in history

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

Change-Id: Iac9e14e36fa72228febcb1656babb168912143e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:02:27 +00:00
Treehugger Robot
9e58dbf4b2 Merge changes from topic "cherrypicker-L23200030000689269:N91700030011100373" into main
* changes:
  Revert^2 "pantah(nfc): Modify NFC overlays for NFC apex"
  Revert^2 "pantah: Replace NFC app with NFC apex"
2023-12-11 22:00:34 +00:00
Xin Li
c826e7064c [automerger skipped] Merge Android 14 QPR1 am: 3ae2ebb35a -s ours
am skip reason: Merged-In I492d68878649c5553a7996482fda2e36e820e440 with SHA-1 4374f3bcdb is already in history

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

Change-Id: I7fd964ba65b15656be44d046bc84d45cdc98ea51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:37 +00:00
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
ee4ada1267 [automerger skipped] Merge UQ1A.231205.015 am: 4374f3bcdb -s ours
am skip reason: Merged-In I075a42359d9cdc1984dfb2057808fb1a9bd8e909 with SHA-1 a1eee239bb is already in history

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

Change-Id: Ieb7fc27ae231342f00bfcf8e1bdc90ad72ea617b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:18 +00:00
Xin Li
4374f3bcdb Merge UQ1A.231205.015
Bug: 308969284
Merged-In: I075a42359d9cdc1984dfb2057808fb1a9bd8e909
Change-Id: I492d68878649c5553a7996482fda2e36e820e440
2023-12-07 15:47:21 -08:00
Roshan Pius
7ca0bc8982 Revert^2 "pantah(nfc): Modify NFC overlays for NFC apex"
08fbfb05f1

Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2280e6ea3db5e414f1ace9734d3066d9b3eb4654)
Merged-In: I4ea4668bd7de33fa5a6c80b742dab0a6b27b4936
Change-Id: I4ea4668bd7de33fa5a6c80b742dab0a6b27b4936

Change-Id: Ie620addb17b635f30a6d79661cd3f0ded2afe0df
2023-12-07 10:24:27 -08:00
Roshan Pius
61abf7319e Revert^2 "pantah: Replace NFC app with NFC apex"
3000cdee0e

Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aa3c94e272d388cc559f58faabb85caa2eeef48e)
Merged-In: I4da74311505445715132b84afb557ec7e126abac
Change-Id: I4da74311505445715132b84afb557ec7e126abac

Change-Id: I39f927d3cee2ec84616ecb56704fc2b5d4d4896e
2023-12-07 10:23:55 -08:00
Ankur Bakshi
83be291c08 Update panther SVN to 42 am: e66288cae4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25499294

Change-Id: Ib21aa8491880814e9c0d0093fa53b9db61838201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:26 +00:00
Ankur Bakshi
fc4b3d6734 Update panther SVN to 41 am: 1695374b64
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25499293

Change-Id: I9ae88f0d86dad830d1879235acac5df4402091a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:21 +00:00
Ankur Bakshi
ea48dcac11 Update cheetah SVN to 42 am: 75a9c0a8ef
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25496450

Change-Id: Ib65377cd887b5a5267b92ce7e8e1f5705b96765b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:10 +00:00
Ankur Bakshi
a42ef94268 Update cheetah SVN to 41 am: 119db5acb6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25496610

Change-Id: I99bc75be6b2a1b70a65f44688ae76a2641f92c0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:00 +00:00
Ankur Bakshi
e66288cae4 Update panther SVN to 42
Bug: 313696499
Change-Id: I9eec5502196e2b1b681152a604ba0e0d64a37ea8
2023-11-29 22:08:33 +00:00
Ankur Bakshi
1695374b64 Update panther SVN to 41
Bug: 313696499
Change-Id: Ic6534eee5f78ca57f7f9529b1c35ccfb3cafae74
2023-11-29 22:08:33 +00:00
Ankur Bakshi
75a9c0a8ef Update cheetah SVN to 42
Bug: 313696499
Change-Id: I7658cd580290f964bc5391e0874cf3e8bece6a8c
2023-11-29 06:29:35 +00:00
Ankur Bakshi
119db5acb6 Update cheetah SVN to 41
Bug: 313696499
Change-Id: If57b5ff9871f4daecae1b2219e7d3fcb456dde5e
2023-11-29 06:26:59 +00:00
Treehugger Robot
1bc3f07cf5 Merge "Remove unused Android.mk under device/google/pantah am: 01c6ee7de8 am: 01a89c3591" into udc-qpr-dev-plus-aosp 2023-11-21 03:25:30 +00:00
Herbert Xue
5bba786d8d Remove unused Android.mk under device/google/pantah am: 01c6ee7de8 am: 1264b2767b
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2836176

Change-Id: Iba7d7c3e7e2ce1d240a3665ea944f09cc9955303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 02:43:51 +00:00
Herbert Xue
a82de9d5e6 Remove unused Android.mk under device/google/pantah am: 01c6ee7de8 am: 01a89c3591
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2836176

Change-Id: I7de75a300ac3448ba1cd9c146dfbfca097f595c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:55:02 +00:00
Herbert Xue
1264b2767b Remove unused Android.mk under device/google/pantah am: 01c6ee7de8
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2836176

Change-Id: I196f6b1c36c5c9862f8733488efcfe0baf1fd206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:24:06 +00: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
Ankur Bakshi
4532bd63fb Update panther SVN to 40 am: e05ba05b57
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25364492

Change-Id: I377e0a45c7e928b73f8f938a5938ee41f34868cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 21:35:23 +00:00
Ankur Bakshi
9613b8b77b Update cheetah SVN to 40 am: 6c10cd72b8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25365067

Change-Id: I0cee30445562195f311cbad2e9dfe4e4fc11ff07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 21:35:15 +00:00
Ankur Bakshi
e05ba05b57 Update panther SVN to 40
Bug: 309529736
Change-Id: I250bc0d8ce0e3df1347015466a671d2ef20becd3
2023-11-16 20:42:25 +00:00
Ankur Bakshi
6c10cd72b8 Update cheetah SVN to 40
Bug: 309529736
Change-Id: Ic369fc71b2993b51fe7ab017d7527f835ce55ea9
2023-11-16 20:42:25 +00:00
Ankur Bakshi
d08e4a25fc Update panther SVN to 39 am: 0fd147e544
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25341847

Change-Id: I71df92e324c2e5eebdbdcca69e25d5ff44fb7c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:29:10 +00:00
Ankur Bakshi
341abbe2bd Update cheetah SVN to 39 am: ea419cb1ae
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25343873

Change-Id: I08e425aa24bc70a22653695612c8885b3c3e33f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:29:00 +00:00
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
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
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
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
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