Commit graph

2604 commits

Author SHA1 Message Date
Roshan Pius
13426a9d37 Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex"
041ffd8ea6

Bug: 303286040
Test: Compiles

Change-Id: I443bcf2681437ec4a0caa3fdb5046ab856db0ddb
2023-12-04 13:48:34 -08:00
Roshan Pius
35de536662 Revert^2 "bluejay: Replace NFC app with NFC apex"
75bff8a95f

Bug: 303286040
Test: Compiles

Change-Id: Ibc741f24cc6d19adda3097d17bc81baf455f71d3
2023-12-04 11:52:21 -08:00
Ankur Bakshi
0993543fec Update bluejay SVN to 54 am: 97ca2e0e16 am: 11681ac049
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25498857

Change-Id: I699e3d42976347241e9605ace826fa80c3b505de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 23:05:23 +00:00
Ankur Bakshi
11681ac049 Update bluejay SVN to 54 am: 97ca2e0e16
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25498857

Change-Id: Iae6988b087452e056db920b146c7b4aa37b7eaf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:00 +00:00
Ankur Bakshi
97ca2e0e16 Update bluejay SVN to 54
Bug: 313696499
Change-Id: Iadb6f6d58659b63bb1d3d1fad6c6c839f899814c
2023-11-29 06:19:57 +00:00
Treehugger Robot
4f49b25fdc Merge "[conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436 am: 97d8fa99d2" into udc-qpr-dev-plus-aosp am: 2d4767736f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25422286

Change-Id: I90daa087ffa06c6b99e6fd5f95574f51954a5fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 04:04:38 +00:00
Treehugger Robot
2d4767736f Merge "[conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436 am: 97d8fa99d2" into udc-qpr-dev-plus-aosp 2023-11-21 03:25:34 +00:00
Herbert Xue
930cfe784b [conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436 am: 3a915de31c am: 2ddcebecac
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25420741

Change-Id: If2b52762be3294ba73e5014bb77156e2f2913752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 03:14:57 +00:00
Herbert Xue
2ddcebecac [conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436 am: 3a915de31c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25420741

Change-Id: Ibc8eeffdb3ac3fea6b260105465da40b12002740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 02:43:51 +00:00
Herbert Xue
3a915de31c [conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2833591

Change-Id: I093a1c8ac7b50c5b1b601d54e465ca5ecbd87aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 06:15:11 +00:00
Herbert Xue
5c58271bdd [conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436 am: 97d8fa99d2
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2833591

Change-Id: I56dee3e1b7b310cf9253f486b33241ac0aecf300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 05:25:42 +00:00
Herbert Xue
97d8fa99d2 Remove unused Android.mk under device/google/bluejay am: 34aaf50436
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2833591

Change-Id: If934bea2fd396ce3b53484f7163392483362d434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:23:54 +00:00
Herbert Xue
34aaf50436 Remove unused Android.mk under device/google/bluejay
Bug: 311323531
Test: NA
Change-Id: I211369e7edbf48463ab88dfd49ca05b33d5541d1
2023-11-16 15:42:56 +08:00
Treehugger Robot
b7fe1b234c Merge "gps: Enable Vzw SUPL OTDOA" into main 2023-11-16 06:09:31 +00:00
Cheng Chang
dace074978 gps: Enable Vzw SUPL OTDOA
Bug: 310795649
Test: OTDOA test in b/310795649
Change-Id: I65e76c36c382fd51a32dc0b129250ea6a3dc6be3
2023-11-16 05:20:36 +00:00
Ankur Bakshi
34218b7f56 Update bluejay SVN to 53 am: 07440b702a am: 1a582f21af
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25293113

Change-Id: I5aafa5033504a8d50ea9ad1bc738b9996f402aee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:59:09 +00:00
Ankur Bakshi
1a582f21af Update bluejay SVN to 53 am: 07440b702a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25293113

Change-Id: I7e3d5a3f73012863056ae3e46c8c642eb332294e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:29:00 +00:00
Roshan Pius
ac8d07020a [automerger skipped] Merge changes from topic "nfc_apex_revert" into main am: 3ea3148bf7 am: 60ec70c8ac -s ours am: 5d8e11e8c8 -s ours
am skip reason: Merged-In Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6 with SHA-1 b5ff2c83d3 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2817309

Change-Id: I2bc76ccd6981f4d43b2678ab422f429bb02c7fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:34:38 +00:00
Roshan Pius
02de934f5c [automerger skipped] Revert "bluejay(nfc): Modify NFC overlays for NFC apex" am: a940645a6e am: 13b9a3e096 am: a0a1d5d898 -s ours
am skip reason: Merged-In Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da with SHA-1 041ffd8ea6 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2818124

Change-Id: I3c33b140a12313d38fbbed7fae44e0ed039e77a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:34:22 +00:00
Roshan Pius
a9c867f862 [automerger skipped] Merge changes from topic "nfc_apex_revert" into main am: 3ea3148bf7 am: 90deaed1ec am: b5958e72c1 -s ours
am skip reason: Merged-In Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6 with SHA-1 75bff8a95f is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2817309

Change-Id: I23c2324f7f316c837e0b4d6cc8e5922aea7bf98b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:30:54 +00:00
Roshan Pius
e2e33c30d0 [automerger skipped] Revert "bluejay(nfc): Modify NFC overlays for NFC apex" am: a940645a6e am: 033e515e0a am: 7c287ce810 -s ours
am skip reason: Merged-In Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da with SHA-1 041ffd8ea6 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2818124

Change-Id: Idf266c9eb0cde541bf6695b98b3c9ec6d493a47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:30:34 +00:00
Roshan Pius
5d8e11e8c8 [automerger skipped] Merge changes from topic "nfc_apex_revert" into main am: 3ea3148bf7 am: 60ec70c8ac -s ours
am skip reason: Merged-In Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6 with SHA-1 b5ff2c83d3 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2817309

Change-Id: Ia0e67c4f32964211fc1c2ca02c76359aab6df3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:57 +00:00
Roshan Pius
a0a1d5d898 Revert "bluejay(nfc): Modify NFC overlays for NFC apex" am: a940645a6e am: 13b9a3e096
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2818124

Change-Id: Icd2da1eedac453c9f80cbf32f777b80b0742f35e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:40 +00:00
Roshan Pius
b5958e72c1 Merge changes from topic "nfc_apex_revert" into main am: 3ea3148bf7 am: 90deaed1ec
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2817309

Change-Id: Id47781a6cec01070565be7c2f67edc4cc8cc82f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:18 +00:00
Roshan Pius
7c287ce810 Revert "bluejay(nfc): Modify NFC overlays for NFC apex" am: a940645a6e am: 033e515e0a
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2818124

Change-Id: I644d4b2f369e336ab0c1929ddaaef8f327361504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:05 +00:00
Roshan Pius
60ec70c8ac Merge changes from topic "nfc_apex_revert" into main am: 3ea3148bf7
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2817309

Change-Id: I0f7989411afb04eed83d741de1fabb304551763c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:49:10 +00:00
Roshan Pius
13b9a3e096 Revert "bluejay(nfc): Modify NFC overlays for NFC apex" am: a940645a6e
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2818124

Change-Id: I7d34f2e80cc65bfa0073cb843047ae71feaebf4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:48:53 +00:00
Roshan Pius
90deaed1ec Merge changes from topic "nfc_apex_revert" into main am: 3ea3148bf7
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2817309

Change-Id: Iffae5bfd6abee081d9d4322a67225cc5efe3bc5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:43 +00:00
Roshan Pius
033e515e0a Revert "bluejay(nfc): Modify NFC overlays for NFC apex" am: a940645a6e
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2818124

Change-Id: I20f7a7a2526280005d50c3d1f15b7a82d3f442ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:25 +00:00
Roshan Pius
3ea3148bf7 Merge changes from topic "nfc_apex_revert" into main
* changes:
  Revert "bluejay: Replace NFC app with NFC apex"
  Revert "bluejay(nfc): Modify NFC overlays for NFC apex"
2023-11-08 21:16:20 +00:00
Becker (Chan-Ying) Lien
e32625aee0 Update ShannonIms CERTIFICATE to PRESIGNED am: 794f6831d7 am: 5b54fcc3bf
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25300807

Change-Id: Ia50f92f511b26202a8d548e1fddce4a98156812e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 20:20:10 +00:00
Becker (Chan-Ying) Lien
9f9cbc457e Update ShannonIms CERTIFICATE to PRESIGNED am: 9b3e8fd791
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25300808

Change-Id: Ida735edfffc84fa6066d270b8bc3dc8b69df44b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 20:18:31 +00:00
Becker (Chan-Ying) Lien
5b54fcc3bf Update ShannonIms CERTIFICATE to PRESIGNED am: 794f6831d7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25300807

Change-Id: I3a0e79431fd044eb44a3aceea09f7dd2ffb6858e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 20:13:51 +00:00
Becker (Chan-Ying) Lien
9b3e8fd791 Update ShannonIms CERTIFICATE to PRESIGNED
Bug: 298956897
Change-Id: I0680982853a630b2c3744278f7a09b356ff2cb69
2023-11-07 19:12:07 +00:00
Becker (Chan-Ying) Lien
794f6831d7 Update ShannonIms CERTIFICATE to PRESIGNED
Bug: 298956897
Change-Id: I0680982853a630b2c3744278f7a09b356ff2cb69
2023-11-07 19:11:42 +00:00
Roshan Pius
b5ff2c83d3 Revert "bluejay: 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:75bff8a95f3e1fbeeaffce4d2fe720152761edbd)
Merged-In: Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6
Change-Id: Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6
2023-11-07 06:10:47 +00:00
Ankur Bakshi
07440b702a Update bluejay SVN to 53
Bug: 309529736
Change-Id: I1b51751e908872be4c140ebf19dd1d291d3de1b4
2023-11-07 03:16:32 +00:00
Roshan Pius
a940645a6e Revert "bluejay(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: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da
Change-Id: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da
2023-11-06 19:44:18 +00:00
Roshan Pius
673e68a456 Merge "Revert "bluejay: Replace NFC app with NFC apex"" into main 2023-11-06 14:31:02 +00:00
Roshan Pius
041ffd8ea6 Revert "bluejay(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:40ba66aca3ed1c1e5d3a7dbbaffa0b73ec4d396c)
Merged-In: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da
Change-Id: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da
2023-11-04 19:04:14 +00:00
Roshan Pius
75bff8a95f Revert "bluejay: 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: Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6
Test: Compiles, device boots up
2023-11-04 14:59:42 +00:00
Greg Kaiser
a60dc94e37 [automerger skipped] Fix lunch choices for git_main am: bb35cfaea7 am: d03c28f14c -s ours am: c4c78a25d6 -s ours
am skip reason: Merged-In I47590aaf84bd2481d53c04889c2963e02b7a816d with SHA-1 bb35cfaea7 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2809994

Change-Id: I642287692c17cf918e342bf4f5cd1c40f14309e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 19:31:34 +00:00
Greg Kaiser
f1216af10c [automerger skipped] Fix lunch choices for git_main am: bb35cfaea7 am: b4bbe177a3 am: d90d14358e -s ours
am skip reason: Merged-In I47590aaf84bd2481d53c04889c2963e02b7a816d with SHA-1 c0159563f3 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2809994

Change-Id: I9b7cb0afc440718e97d71ce7ba6c34d5c3a3d55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 19:28:27 +00:00
Greg Kaiser
c4c78a25d6 [automerger skipped] Fix lunch choices for git_main am: bb35cfaea7 am: d03c28f14c -s ours
am skip reason: Merged-In I47590aaf84bd2481d53c04889c2963e02b7a816d with SHA-1 bb35cfaea7 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2809994

Change-Id: I22b57a1a473c16929efa7aee1821866ca141a854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 17:50:05 +00:00
Greg Kaiser
d90d14358e Fix lunch choices for git_main am: bb35cfaea7 am: b4bbe177a3
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2809994

Change-Id: I1a99fd05a2269f6efe66a41f5e16af62f899832b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 17:48:16 +00:00
Greg Kaiser
d03c28f14c Fix lunch choices for git_main am: bb35cfaea7
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2809994

Change-Id: I5c7ecc1115e20a1a9ecc512f6b1212f27623ebf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 17:23:43 +00:00
Greg Kaiser
b4bbe177a3 Fix lunch choices for git_main am: bb35cfaea7
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2809994

Change-Id: I267fba100cf2500f834952fc212b680c12e8cdee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 17:22:04 +00:00
Greg Kaiser
bb35cfaea7 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:c0159563f3835c858d6587bebcbd87d123113530)
Merged-In: I47590aaf84bd2481d53c04889c2963e02b7a816d
Change-Id: I47590aaf84bd2481d53c04889c2963e02b7a816d
2023-10-30 16:41:50 +00:00
Will Song
c4f8b78d61 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: Ic6f1dbb7fb467be8479f19f1b199921c00d3f5d5
2023-10-29 05:54:40 +00:00
Cyan Hsieh
9f7914a146 Merge "Split bootloader prebuilt to 24Q1 and trunk version" into main 2023-10-27 03:05:11 +00:00