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
Yvonne Yip
1285e6a938
powerhint: game mode tuning
...
Test: test build
Bug: 295636226
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:df0dd037f41de6fc46c2d51f544426f993480469 )
Merged-In: I3fd4cff4da5815e7018b69ff08aada79cc1f6e7d
Change-Id: I3fd4cff4da5815e7018b69ff08aada79cc1f6e7d
2023-10-31 17:12:23 -07:00
Yvonne Yip
e9b8123612
powerhint: add game mode tuning nodes
...
Add down_rate_limit_us nodes, tapered_dvfs_headroom nodes.
Test: build
Bug: 295636226
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:33cd1ee8f025122df92662aceef76d55677f02a6 )
Merged-In: I6b200ac6d41e06f445a97583fc189ace924f1fa6
Change-Id: I6b200ac6d41e06f445a97583fc189ace924f1fa6
2023-10-31 17:12:21 -07: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
Android Build Coastguard Worker
a362098033
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25177019', 'googleplex-android-review.googlesource.com/25069787', 'googleplex-android-review.googlesource.com/25176278'] into udc-qpr1-release.
...
Change-Id: I57dcbf0b3942451523291f5d793c643e5a4299cf
2023-10-27 03:36:01 +00:00
Ankur Bakshi
3a56f8bf7a
Update bluejay SVN to 52
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8f9b6dbaaa8e78c8ded400d19d2f7d89fdaf2fd8 )
Merged-In: I403e87cf5943f5c45d6d0db99a3e15018064067a
Change-Id: I403e87cf5943f5c45d6d0db99a3e15018064067a
2023-10-27 03:31:19 +00:00
Shivakumar Neginal
ad5bdd72ff
Adding Fast Pair extended IDs for Pixel 6a
...
Adding the Fast Pair extended IDs for bluejay so that
Quick Start shows the right Fast Pair bottom sheet on other devices
during setup.
Bug: 305516133
Test: TBD
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:648307e16fe999eec1c83ab2df5bfa6364076216 )
Merged-In: I852842706664902dc3a76175810ebf869439796d
Change-Id: I852842706664902dc3a76175810ebf869439796d
2023-10-27 03:31:11 +00:00
Lokesh Kumar Goel
be53203261
Update bluejay SVN to 51
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d81b0b63f1806dbd9353d266dc0bab6a3e0549fd )
Merged-In: If8f16626a5e13f98e81ff0833a60888efe9cddcd
Change-Id: If8f16626a5e13f98e81ff0833a60888efe9cddcd
2023-10-27 03:31:04 +00:00
Cyan Hsieh
9f7914a146
Merge "Split bootloader prebuilt to 24Q1 and trunk version" into main
2023-10-27 03:05:11 +00:00
Treehugger Robot
64eec32aa6
Merge "Update bluejay SVN to 52" into udc-qpr-dev am: e738f3743c
am: 1be98cb13f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25176278
Change-Id: I41f38ba46dce5846d1718525c252a5a45fd7f92b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:49:19 +00:00
Treehugger Robot
1be98cb13f
Merge "Update bluejay SVN to 52" into udc-qpr-dev am: e738f3743c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25176278
Change-Id: I60aa12faacc60ad2249c00821e1055cf735c343f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:18:44 +00:00
Treehugger Robot
e738f3743c
Merge "Update bluejay SVN to 52" into udc-qpr-dev
2023-10-27 01:50:02 +00:00
Treehugger Robot
c3519ba9e9
Merge " Adding Fast Pair extended IDs for Pixel 6a" into udc-qpr-dev am: 8a9f1ae07a
am: 0435ed76ad
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25069787
Change-Id: I6b0a90c95f43cabd1c64fc167e684c23ac8815c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 23:51:57 +00:00
Treehugger Robot
0435ed76ad
Merge " Adding Fast Pair extended IDs for Pixel 6a" into udc-qpr-dev am: 8a9f1ae07a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25069787
Change-Id: I20be0837399458d0c7c08270e5963f0215c81e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 23:21:25 +00:00
Treehugger Robot
8a9f1ae07a
Merge " Adding Fast Pair extended IDs for Pixel 6a" into udc-qpr-dev
2023-10-26 22:55:38 +00:00
Lokesh Kumar Goel
c75b1b2e69
Update bluejay SVN to 51 am: d81b0b63f1
am: 4a915db3d6
am: fa413e9e5a
am: ee9f7982a8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25177019
Change-Id: Ib00a8acb6b308609c0e9ac405e7b60b234edc99b
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
0de50b5230
[automerger skipped] Update bluejay SVN to 50 am: d92f98af41
am: 99b6c8f2d0
-s ours am: aa63eb3e2e
-s ours am: 7a87d5e4f9
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25175978
Change-Id: I5cabeb6c9af7acd64cbd7283cc2114686b39e9f3
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
01082bdd74
Update bluejay SVN to 51 am: d81b0b63f1
am: 324dad2794
am: bd863791db
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25177019
Change-Id: I08f86401fecdf1746ecd859e8bd6158788f852e6
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
85549b7e0f
[automerger skipped] Update bluejay SVN to 50 am: d92f98af41
am: 7f7d1b1bc2
-s ours am: 66e4f34a48
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25175978
Change-Id: Ibff87a2ac74306349876351712d7fe21df292647
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
ee9f7982a8
Update bluejay SVN to 51 am: d81b0b63f1
am: 4a915db3d6
am: fa413e9e5a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25177019
Change-Id: Iddd0eff9458b2236ccf4a13952fc4a1d91bf9c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:29 +00:00
Lokesh Kumar Goel
7a87d5e4f9
[automerger skipped] Update bluejay SVN to 50 am: d92f98af41
am: 99b6c8f2d0
-s ours am: aa63eb3e2e
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25175978
Change-Id: Ie55daae61aa2b29a2dc73b55ee200782b0e51056
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
bd863791db
Update bluejay SVN to 51 am: d81b0b63f1
am: 324dad2794
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25177019
Change-Id: I41fa243c7fd2491c6692a6e00e0dd17d9b977b2b
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
66e4f34a48
[automerger skipped] Update bluejay SVN to 50 am: d92f98af41
am: 7f7d1b1bc2
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25175978
Change-Id: I5e741dc483fee71d8005cdbc71c408cd28f5db30
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
d8f39f65fe
Update bluejay SVN to 51 am: d81b0b63f1
am: fa31f7845b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25177019
Change-Id: Id0e16c757751149204af074c20ad83850c9565c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:29:52 +00:00