Roshan Pius
20494a566f
Revert "felix(nfc): Modify NFC overlays for NFC apex" am: 98699d7fb9
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2818128
Change-Id: If410b9437051e4281818fc444d433234f12707da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:48:51 +00:00
Roshan Pius
f94b13f69d
Merge changes from topic "nfc_apex_revert" into main am: 4bc515224b
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2817310
Change-Id: I0a1af4db29e0c8d1c596572f6346e808a8e31716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:30 +00:00
Roshan Pius
1cabb5c5a8
Revert "felix(nfc): Modify NFC overlays for NFC apex" am: 98699d7fb9
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2818128
Change-Id: Ib829c4d8b660a795d38ca72ba71556a2732c291d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:23 +00:00
Roshan Pius
4bc515224b
Merge changes from topic "nfc_apex_revert" into main
...
* changes:
Revert "felix: Replace NFC app with NFC apex"
Revert "felix(nfc): Modify NFC overlays for NFC apex"
2023-11-08 21:16:20 +00:00
Poomarin Phloyphisut
e32682b14c
[CCA] Set enable flag by default on Felix.
...
Bug: 309566086
Test: N/A
Change-Id: Ibf847c16f69d8606b2fec8fe82930a7149632290
2023-11-07 07:01:15 +00:00
paulsu
a227608517
Powerhint update containing PMU and EM tuning for 30FPS
...
Port from ag/20028064
Bug: 262668624
Test: Local test
Change-Id: Ia2cd6e1c55fdc2d2cefb507782208cd19dc651df
Signed-off-by: paulsu <paulsu@google.com>
2023-11-07 06:44:45 +00:00
Roshan Pius
7091f06342
Revert "felix: 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:09c1ce320b7948c069bc48645b90eb55cae2bd3e )
Merged-In: Ib09ea604351cea2c4ed40e64c0bf783a666eb08b
Change-Id: Ib09ea604351cea2c4ed40e64c0bf783a666eb08b
2023-11-07 06:11:02 +00:00
Roshan Pius
98699d7fb9
Revert "felix(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: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
Change-Id: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
2023-11-06 19:45:22 +00:00
Roshan Pius
8296448354
Merge "Revert "felix: Replace NFC app with NFC apex"" into main
2023-11-06 14:31:02 +00:00
Roshan Pius
e274b4177a
Revert "felix(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:9b9ed35e2791458c36b792ee049972c978b75606 )
Merged-In: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
Change-Id: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
2023-11-04 19:04:38 +00:00
Roshan Pius
09c1ce320b
Revert "felix: 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: Ib09ea604351cea2c4ed40e64c0bf783a666eb08b
Test: Compiles, device boots up
2023-11-04 14:59:04 +00:00
Greg Kaiser
77c7941c6d
[automerger skipped] Fix lunch choices for git_main am: eecbe76392
am: 7a361e0fde
-s ours am: 14776220a7
-s ours
...
am skip reason: Merged-In I441fde351191dfa28e48a54538249be57310971f with SHA-1 eecbe76392
is already in history
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2809728
Change-Id: I2abd9857f5f288e07200b0b67daa8ece3fadcd10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:14:34 +00:00
Greg Kaiser
9f65d7a424
[automerger skipped] Fix lunch choices for git_main am: eecbe76392
am: e1145ed773
am: 152117510d
-s ours
...
am skip reason: Merged-In I441fde351191dfa28e48a54538249be57310971f with SHA-1 2d13c2fd2b
is already in history
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2809728
Change-Id: I2eca67a50065e84f8137d07ccd95763a42044a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:12:10 +00:00
Greg Kaiser
14776220a7
[automerger skipped] Fix lunch choices for git_main am: eecbe76392
am: 7a361e0fde
-s ours
...
am skip reason: Merged-In I441fde351191dfa28e48a54538249be57310971f with SHA-1 eecbe76392
is already in history
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2809728
Change-Id: Ia82b990136329eb125d8e8fab292507c671ad4fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:06:42 +00:00
Greg Kaiser
7a361e0fde
Fix lunch choices for git_main am: eecbe76392
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2809728
Change-Id: Iff4614a102fb82f92203b7838976577554f4c055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:42:15 +00:00
Greg Kaiser
152117510d
Fix lunch choices for git_main am: eecbe76392
am: e1145ed773
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2809728
Change-Id: I442166cfcb7e3855ec38d2524cf5fb6cfe95049b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:37:19 +00:00
Greg Kaiser
e1145ed773
Fix lunch choices for git_main am: eecbe76392
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2809728
Change-Id: I5272a3c8c148b21b0a6e835d0653367349b3cb9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:10:18 +00:00
Greg Kaiser
eecbe76392
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:2d13c2fd2bbc1164beca59490ca0f1c88c25a256 )
Merged-In: I441fde351191dfa28e48a54538249be57310971f
Change-Id: I441fde351191dfa28e48a54538249be57310971f
2023-10-30 22:00:32 +00:00
Shin-Yu Wang
099bd7fd13
Update idle timer setting
...
Bug: 308140167
Test: check result of `adb shell getprop ro.surface_flinger.set_idle_timer_ms`
Change-Id: I873e69c385d787567a14427c007fa834c1a66062
2023-10-30 14:45:56 +00:00
Will Song
0a08ee73c6
PREUPLOAD: Enforce jsonlint in preupload
...
Checks syntax and simple brace balances for all JSON files.
Test: Edit any json and try upload
Bug: 127794899
Change-Id: Ife780a176c9b7599b7c3653b85ea4a144d0e567e
2023-10-29 02:10:28 +00:00
Android Build Coastguard Worker
1c069c5ccd
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25176955', 'googleplex-android-review.googlesource.com/25063890', 'googleplex-android-review.googlesource.com/25181894'] into udc-qpr1-release.
...
Change-Id: I723e6b90de0086e165cef0e5f7ca0fe202bc0e61
2023-10-27 03:36:03 +00:00
Ankur Bakshi
dffbdd0b0f
Update felix SVN to 30
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:acd9c7a658123df92ee49b358b01bc5811911905 )
Merged-In: Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359
Change-Id: Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359
2023-10-27 03:31:44 +00:00
Shivakumar Neginal
403b895a06
Adding Fast Pair extended IDs for F10
...
Adding the Fast Pair extended IDs for felix 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:9931ca082a643bd498f22cfa59d4d7954bce6e63 )
Merged-In: Iec1e7b85e802e55b204d0bebfaf9c2f83ca588f2
Change-Id: Iec1e7b85e802e55b204d0bebfaf9c2f83ca588f2
2023-10-27 03:31:35 +00:00
Lokesh Kumar Goel
aa4d849349
Update felix SVN to 29
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0c650e810d598f67b21cb0f862c12c1d4fd68490 )
Merged-In: Ia1f09da58824a8300e364bd3236fad0685ee5508
Change-Id: Ia1f09da58824a8300e364bd3236fad0685ee5508
2023-10-27 03:31:26 +00:00
Cyan Hsieh
684f06aee3
Merge "Split bootloader prebuilt to 24Q1 and trunk version" into main
2023-10-27 03:04:52 +00:00
Treehugger Robot
3292ed70fa
Merge "Update felix SVN to 30" into udc-qpr-dev am: 191a8f3462
am: e3dc31a837
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25181894
Change-Id: I2fcb6f1af1f25afdf69e0fc5e7e15149d384d220
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:49:48 +00:00
Treehugger Robot
e3dc31a837
Merge "Update felix SVN to 30" into udc-qpr-dev am: 191a8f3462
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25181894
Change-Id: I6750b4258a5a09ccd204444124d714889e8c8b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:18:52 +00:00
Treehugger Robot
191a8f3462
Merge "Update felix SVN to 30" into udc-qpr-dev
2023-10-27 01:46:44 +00:00
Treehugger Robot
125b612cb9
Merge " Adding Fast Pair extended IDs for F10" into udc-qpr-dev am: fb7ad6b67f
am: 56658f374e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25063890
Change-Id: I59c11f6a03a8886b70b208bc7069a856e68b7834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 23:50:53 +00:00
Treehugger Robot
56658f374e
Merge " Adding Fast Pair extended IDs for F10" into udc-qpr-dev am: fb7ad6b67f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25063890
Change-Id: I31f08ca225e90d7f5cc32d01853ea3ea7904513d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 23:21:16 +00:00
Treehugger Robot
fb7ad6b67f
Merge " Adding Fast Pair extended IDs for F10" into udc-qpr-dev
2023-10-26 22:56:18 +00:00
Lokesh Kumar Goel
822fc2a336
Update felix SVN to 29 am: 0c650e810d
am: 6c0822bd46
am: f05ecce84e
am: c5b3e5b272
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: I74e3e46e841a6c84027e2ac4484e871bc05e692e
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
2387becf45
[automerger skipped] Update felix SVN to 28 am: 8ad0e2cf93
am: 1a04115be1
-s ours am: b5a77f9e0e
-s ours am: dc93f0b997
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: If635830508be935ed8a2bcf4424287c11e386d78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:21:51 +00:00
Lokesh Kumar Goel
42591aa9ee
Update felix SVN to 29 am: 0c650e810d
am: d0e0bcb6a5
am: 9ac8802a3a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: I32b38322dcac178b920410ced48fea1a711fb922
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
f2a4e2c7f7
[automerger skipped] Update felix SVN to 28 am: 8ad0e2cf93
am: 446501afd9
-s ours am: 0dff87e435
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: I5eb3bbbf615d69ac927e54b95cef3766e552a373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:56:37 +00:00
Lokesh Kumar Goel
c5b3e5b272
Update felix SVN to 29 am: 0c650e810d
am: 6c0822bd46
am: f05ecce84e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: I0ace5e027ccb00c9cf4af9c0d1964e628e886cae
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
dc93f0b997
[automerger skipped] Update felix SVN to 28 am: 8ad0e2cf93
am: 1a04115be1
-s ours am: b5a77f9e0e
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: Ic98a437f40559fbd717abdfa06c0fa11ce3ffafa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:54:57 +00:00
Lokesh Kumar Goel
9ac8802a3a
Update felix SVN to 29 am: 0c650e810d
am: d0e0bcb6a5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: I04762a206bec1da5212c147a94cec0c69f756326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:33:14 +00:00
Lokesh Kumar Goel
0dff87e435
[automerger skipped] Update felix SVN to 28 am: 8ad0e2cf93
am: 446501afd9
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: I5f22073a07063dd1f839f6d9e939e5f8bfb61a56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:32:35 +00:00
Lokesh Kumar Goel
b09aab5213
Update felix SVN to 29 am: 0c650e810d
am: 0d2a8a6942
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: Ie08b567f3e29befc220b71b6c6e283a451ad5be7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:29:52 +00:00
Lokesh Kumar Goel
e5d1aef0ca
[automerger skipped] Update felix SVN to 28 am: 8ad0e2cf93
am: 67a29b5bb5
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: I2542a2aeb9a3c3c8473445c348cb1840e26ca6a0
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
f05ecce84e
Update felix SVN to 29 am: 0c650e810d
am: 6c0822bd46
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: Id9070f1df4dfd3fde396385d511ec9493528c5b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:39 +00:00
Lokesh Kumar Goel
b5a77f9e0e
[automerger skipped] Update felix SVN to 28 am: 8ad0e2cf93
am: 1a04115be1
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: I5767a29210c88b93732ee40485e887b4af7b129e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:00 +00:00
Lokesh Kumar Goel
6c0822bd46
Update felix SVN to 29 am: 0c650e810d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: Ifc0bf65b9c40d3c33f9a5ad89e528302e5f1a867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:06:23 +00:00
Lokesh Kumar Goel
1a04115be1
Update felix SVN to 28 am: 8ad0e2cf93
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: I3b0fcc12c696fa5cd9dc9a24c920f5408daacb2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:05:57 +00:00
Lokesh Kumar Goel
0d2a8a6942
Update felix SVN to 29 am: 0c650e810d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: Ibee3ac7d7f77fe5a0fcb1fbcb70eedf77e89077e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:04:37 +00:00
Lokesh Kumar Goel
67a29b5bb5
Update felix SVN to 28 am: 8ad0e2cf93
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: I673c1f3597ded272c39ba245139107f458ac5658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:04:07 +00:00
Lokesh Kumar Goel
d0e0bcb6a5
Update felix SVN to 29 am: 0c650e810d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955
Change-Id: I0d1ff11bb8df3420779c97aba049991d2448cc6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:52 +00:00
Lokesh Kumar Goel
446501afd9
Update felix SVN to 28 am: 8ad0e2cf93
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953
Change-Id: Iecdf4d01252fd905bfb2e31b953753d727d2bc0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:26 +00:00
Roshan Pius
98e8df30b7
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b
am: fa6eb11ca3
am: 6dc47683b7
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: I2055ba3a83701e572287820a508fb16f99bf5708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 15:30:21 +00:00