Commit graph

3663 commits

Author SHA1 Message Date
Shin-Yu Wang
3479774dae Merge "Update idle timer setting" into main 2023-11-21 02:26:46 +00:00
Herbert Xue
4e93f60c8f Remove unused Android.mk under device/google/felix am: 1890f3cb8b am: 905e71e645
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2835912

Change-Id: I3a39eec5e7136ace54e6cc4f137011ee5678e3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:55:01 +00:00
Herbert Xue
be68db3120 Remove unused Android.mk under device/google/felix am: 1890f3cb8b
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2835912

Change-Id: Iad4487b4e81c72a8bb6893446448b10e679186a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:24:05 +00:00
Herbert Xue
905e71e645 Remove unused Android.mk under device/google/felix am: 1890f3cb8b
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2835912

Change-Id: Ia2da9795fd437e3ed81b45730f9163391017f2f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:23:53 +00:00
Treehugger Robot
33e33783af Merge "felix/vibrator: Update durations to match other projects" into main 2023-11-18 00:37:48 +00:00
Herbert Xue
1890f3cb8b Remove unused Android.mk under device/google/felix
Bug: 311516793
Test: NA
Change-Id: Ic22d3796ae71a86e6ea2a0a732603bb505b84fab
2023-11-17 11:40:58 +08:00
Ankur Bakshi
89e5ec5c2f Update felix SVN to 33 am: faf934e258 am: 3f165557b8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25365247

Change-Id: I61826ef22957ba948d1bf31cb91083c921afd4cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 22:05:42 +00:00
Ankur Bakshi
3f165557b8 Update felix SVN to 33 am: faf934e258
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25365247

Change-Id: I5368e35b8ffdb22c58d9c2caee8198b57240c9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 21:35:15 +00:00
Ankur Bakshi
1a3182a6dd Update felix SVN to 32 am: fbb91bcaa4 am: 84b4c53f2e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25343626

Change-Id: Icd59808b99abeaadc8ac22aa712852b2078ad697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:59:08 +00:00
Ankur Bakshi
84b4c53f2e Update felix SVN to 32 am: fbb91bcaa4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25343626

Change-Id: Ib210a8a5abdd5e3b60df24558293f6c719df5e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:28:59 +00:00
Ankur Bakshi
faf934e258 Update felix SVN to 33
Bug: 309529736
Change-Id: Ic9fcbd860c7882a10f49123e931799a81a6fc059
2023-11-14 04:03:22 +00:00
Jack Wu
cbb27f3c01 felix: update AIDL IGoogleBattery manifest version to 3
Bug: 309518527
Test: TH
Change-Id: I191acadc6814a8c3ea413438dab772c5a4ea6ce1
Signed-off-by: Jack Wu <wjack@google.com>
2023-11-11 03:52:41 +00:00
Ankur Bakshi
fbb91bcaa4 Update felix SVN to 32
Bug: 309529736
Change-Id: I848a8e5489e68040ae10ec18760497a6c6a86500
2023-11-11 02:32:11 +00:00
Ankur Bakshi
59bcdfbd32 Update felix SVN to 31 am: 55b74d41e9 am: 03e4dfdb9b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25293153

Change-Id: I9672a948af23cc7618fdb7605f3c98a2ab517482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 02:10:29 +00:00
Ankur Bakshi
03e4dfdb9b Update felix SVN to 31 am: 55b74d41e9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25293153

Change-Id: Ic0969e706d861cc474c41220068a8b9a841ca44f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 01:39:01 +00:00
Ankur Bakshi
55b74d41e9 Update felix SVN to 31
Bug: 302612466
Change-Id: Id914c4cfcb72b896b750446b663bd9e2be43e34e
2023-11-10 23:15:11 +00:00
Roshan Pius
b9e00d74c5 [automerger skipped] Merge changes from topic "nfc_apex_revert" into main am: 4bc515224b am: 9592292e98 am: 5212a1d557 -s ours
am skip reason: Merged-In Ib09ea604351cea2c4ed40e64c0bf783a666eb08b with SHA-1 09c1ce320b is already in history

Original change: https://android-review.googlesource.com/c/device/google/felix/+/2817310

Change-Id: Iaf9c092612d27bbe4e9fb05cf916859a04fdcc24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:34:27 +00:00
Roshan Pius
ae6070e420 [automerger skipped] Revert "felix(nfc): Modify NFC overlays for NFC apex" am: 98699d7fb9 am: 20494a566f am: 36e918a183 -s ours
am skip reason: Merged-In Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f with SHA-1 e274b4177a is already in history

Original change: https://android-review.googlesource.com/c/device/google/felix/+/2818128

Change-Id: I5730751a4c24ebb0bf675fddbfb74589acd3d054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:34:20 +00:00
Roshan Pius
cdce23a91f [automerger skipped] Merge changes from topic "nfc_apex_revert" into main am: 4bc515224b am: f94b13f69d am: bfca1a6f59 -s ours
am skip reason: Merged-In Ib09ea604351cea2c4ed40e64c0bf783a666eb08b with SHA-1 09c1ce320b is already in history

Original change: https://android-review.googlesource.com/c/device/google/felix/+/2817310

Change-Id: Id5aae34854565c09c8452d79ad6e8d076bafb23c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:30:46 +00:00
Roshan Pius
3948824c91 [automerger skipped] Revert "felix(nfc): Modify NFC overlays for NFC apex" am: 98699d7fb9 am: 1cabb5c5a8 am: 72c38dc683 -s ours
am skip reason: Merged-In Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f with SHA-1 e274b4177a is already in history

Original change: https://android-review.googlesource.com/c/device/google/felix/+/2818128

Change-Id: I6900cb436030ddd8e9bfde4da9054bd28f8af602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:30:33 +00:00
Roshan Pius
5212a1d557 Merge changes from topic "nfc_apex_revert" into main am: 4bc515224b am: 9592292e98
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2817310

Change-Id: I067d5c92de21e61324d3b44b8e72873933f442cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:53 +00:00
Roshan Pius
36e918a183 Revert "felix(nfc): Modify NFC overlays for NFC apex" am: 98699d7fb9 am: 20494a566f
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2818128

Change-Id: Ice9e7b7eede7c2af4b4aba9541e420fe1b57425e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:38 +00:00
Roshan Pius
bfca1a6f59 Merge changes from topic "nfc_apex_revert" into main am: 4bc515224b am: f94b13f69d
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2817310

Change-Id: Idcbbf3af8d330170c9953a28a74987b8a0c1c43c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:09 +00:00
Roshan Pius
72c38dc683 Revert "felix(nfc): Modify NFC overlays for NFC apex" am: 98699d7fb9 am: 1cabb5c5a8
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2818128

Change-Id: If7429732d051c55246986f6c3639a35991cea7a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:03 +00:00
Roshan Pius
9592292e98 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: If1f2f8599e26dea854aa515568430001f7a77699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:49:01 +00:00
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