Xin Li
c9bccbce1e
[automerger skipped] Merge Android 14 QPR1 am: 0afb677cfc
-s ours am: de0aacb8eb
-s ours am: 2bab03a3ff
-s ours
...
am skip reason: Merged-In I93f5517088b4d09d9e241b2d3b4e9c4d26a24934 with SHA-1 fb14bb624a
is already in history
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2863160
Change-Id: Id7f41028f6ce60759ca511f962512f30ffb844b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:57:33 +00:00
Xin Li
2bab03a3ff
[automerger skipped] Merge Android 14 QPR1 am: 0afb677cfc
-s ours am: de0aacb8eb
-s ours
...
am skip reason: Merged-In I93f5517088b4d09d9e241b2d3b4e9c4d26a24934 with SHA-1 fb14bb624a
is already in history
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2863160
Change-Id: Ibab1a882853afb16de1d5b972c04416bdf0ff2ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:02:21 +00:00
Xin Li
de0aacb8eb
[automerger skipped] Merge Android 14 QPR1 am: 0afb677cfc
-s ours
...
am skip reason: Merged-In I93f5517088b4d09d9e241b2d3b4e9c4d26a24934 with SHA-1 fb14bb624a
is already in history
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2863160
Change-Id: I56849a79858ea832dddfb296c2b5a49e203f2a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:31 +00:00
Xin Li
0afb677cfc
Merge Android 14 QPR1
...
Merged-In: I93f5517088b4d09d9e241b2d3b4e9c4d26a24934
Bug: 315507370
Change-Id: I5f517da20906eff45b3446722b855b79c716616d
2023-12-08 13:13:16 -08:00
Xin Li
d7dd297007
[automerger skipped] Merge UQ1A.231205.015 am: fb14bb624a
-s ours am: 0686c05e18
-s ours
...
am skip reason: Merged-In Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359 with SHA-1 acd9c7a658
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25590375
Change-Id: I1e06546c074acb52ec0d3225c631f37145bd6286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:51:02 +00:00
Xin Li
0686c05e18
[automerger skipped] Merge UQ1A.231205.015 am: fb14bb624a
-s ours
...
am skip reason: Merged-In Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359 with SHA-1 acd9c7a658
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25590375
Change-Id: I687bf581e1fff8f710705ab2038be58cb99f7c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:14 +00:00
Treehugger Robot
8179169fb9
Merge "[CCA] Set enable flag by default on Felix." into main
2023-12-08 06:53:03 +00:00
Xin Li
fb14bb624a
Merge UQ1A.231205.015
...
Bug: 308969284
Merged-In: Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359
Change-Id: I93f5517088b4d09d9e241b2d3b4e9c4d26a24934
2023-12-07 15:51:48 -08:00
Treehugger Robot
5c1651531d
Merge "Add zoom boost in powerhint for F10" into main
2023-12-07 02:53:19 +00:00
David Chen
ec09d678cb
Add zoom boost in powerhint for F10
...
This patch is meant to reduce frame drop rate in 60FPS video recording with zoom in/out.
The boost will be triggered at 60FPS video recording while zoom ratio change (for each request that contain zoom ratio control in metadata), and will last for 15 frames.
Test: gca_smoke_test
Bug: 305613607
Change-Id: Ia2a6a452cf2ac7b8ee7a1bd53e5085582d79a2be
2023-12-05 08:28:18 +00:00
Roshan Pius
7777a61a89
Revert^2 "felix(nfc): Modify NFC overlays for NFC apex"
...
e274b4177a
Bug: 303286040
Test: Compiles
Change-Id: I56beefccd8cd5f5d12f6b867a31af60314826242
2023-12-04 13:55:08 -08:00
Roshan Pius
d67ac5d535
Revert^2 "felix: Replace NFC app with NFC apex"
...
09c1ce320b
Bug: 303286040
Test: Compiles
Change-Id: I958b2a07dbde6f036b3a615fde6e4255c59a0843
2023-12-04 11:42:23 -08:00
Hawkwood Glazier
88bf1ddb44
Modify folded smartspace postioning on felix
...
Flag: NONE
Bug: 313530576
Test: Manually checked positioning
Change-Id: I2d326eb259aee2b33aa8bd90abed09bb118d6b3c
2023-12-01 21:35:45 +00:00
Ankur Bakshi
ba9e34eeb8
Update felix SVN to 35 am: a2ba6a3626
am: a17750c933
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25498280
Change-Id: If8bdf679ea205615c61d38cacc358276a81e7501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 23:05:27 +00:00
Ankur Bakshi
1ebb5378f5
Update felix SVN to 34 am: 70828aea7c
am: 5195fe5d33
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25497758
Change-Id: I4d826f4bcb5b677529a192f8106104e2e9334a0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 23:05:23 +00:00
Ankur Bakshi
a17750c933
Update felix SVN to 35 am: a2ba6a3626
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25498280
Change-Id: I5f1e7c3a1273afc8257d515f5af71c5ccf22f38c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:08 +00:00
Ankur Bakshi
5195fe5d33
Update felix SVN to 34 am: 70828aea7c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25497758
Change-Id: Ic2de088aa19cb9e9dfdf6cfd48456c51f3762563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:34:59 +00:00
Ankur Bakshi
a2ba6a3626
Update felix SVN to 35
...
Bug: 313696499
Change-Id: I0e48bc56e019bcec717685f2e9f2ce2ce23f06af
2023-11-29 06:41:34 +00:00
Ankur Bakshi
70828aea7c
Update felix SVN to 34
...
Bug: 313696499
Change-Id: I8e4178345c1e91d3dd7b203ac4462e29c07aff0b
2023-11-29 06:34:50 +00:00
Jack Wu
11d3315907
felix: update AIDL IGoogleBattery manifest version to 3
...
Bug: 313379822
Test: TH
Change-Id: I0b190e62c67eaf9e0115a7355abf50f1663acc40
Signed-off-by: Jack Wu <wjack@google.com>
2023-11-27 17:54:59 +08:00
Treehugger Robot
6c5089aeef
Merge "Remove unused Android.mk under device/google/felix am: 1890f3cb8b
am: 905e71e645
" into udc-qpr-dev-plus-aosp am: 5e6f781aee
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2835912
Change-Id: If7844e328f973e038e74a4ade5e2f895692126f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 04:04:37 +00:00
Treehugger Robot
5e6f781aee
Merge "Remove unused Android.mk under device/google/felix am: 1890f3cb8b
am: 905e71e645
" into udc-qpr-dev-plus-aosp
2023-11-21 03:25:37 +00:00
Herbert Xue
6ab776dd33
Remove unused Android.mk under device/google/felix am: 1890f3cb8b
am: be68db3120
am: b1d262f103
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2835912
Change-Id: I34d137678b56c4b6b1404fafc7cce4b482631cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 03:14:56 +00:00
Herbert Xue
b1d262f103
Remove unused Android.mk under device/google/felix am: 1890f3cb8b
am: be68db3120
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2835912
Change-Id: Ibe6badf4390c8bc299596cc8e9eaad5c74c2ab8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 02:43:50 +00:00
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