Peter (YM)
0b1da34e0d
Merge "thermal: read thermistor temp from sysfs" into main
2024-08-19 04:10:06 +00:00
Peter (YM)
caeaff1444
thermal: read thermistor temp from sysfs
...
- avoid wrong sensor value reading for thermalHAL
Bug: 327327502
Test: Build to boot to home
Flag: EXEMPT (bug 337358613)
Change-Id: I93cbfa767a8d882eba526d72ce9ba3c389cd0a1e
Signed-off-by: Peter (YM) <peterym@google.com>
2024-08-16 06:26:10 +00:00
Peter (YM)
600d262d0a
Merge "thermal:remove unused state2power value" into main
2024-08-15 07:19:17 +00:00
Peter (YM)
5142673794
thermal:remove unused state2power value
...
Bug: 355566259
Test: Build test
Flag: EXEMPT NDK
Change-Id: Ib3e2e2772c340d13f3bc80583f6e1f1b7715a44d
Signed-off-by: Peter (YM) <peterym@google.com>
2024-08-15 04:14:36 +00:00
Ankur Bakshi
d86e92697e
Merge "Update felix SVN to 55" into main
2024-08-15 00:48:51 +00:00
Ankur Bakshi
9e47f5a1ce
Update felix SVN to 55
...
Bug:352170103
Change-Id: Ib76fb34d8c9fa0317c7cc150a80d5fe79bcec81f
Flag: EXEMPT bugfix
2024-08-14 23:07:38 +00:00
Chris Paulo
4c54ddb36f
Merge changes from topic "felix_polling_scaling" into main
...
* changes:
vibrator: Fix scaling logic for felix vibrator
vibrator: Update polling timeout to 50ms
2024-08-14 00:10:55 +00:00
Xin Li
e13fb63655
[automerger skipped] Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future am: 5d40c09b2d
-s ours
...
am skip reason: Merged-In I60fb3fb1d4ddae9ce7a3b07a5392b12e76c388dc with SHA-1 36015c810e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/28710528
Change-Id: Idae7b5a9a22f1b4111f0fab60576c7e07dfe4643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-12 21:03:09 +00:00
Xin Li
0c904894a5
[automerger skipped] Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future am: f10b8dce08
-s ours
...
am skip reason: Merged-In I60fb3fb1d4ddae9ce7a3b07a5392b12e76c388dc with SHA-1 36015c810e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/28710528
Change-Id: Ic78e9651ba3f81dea62933861676290389611423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-12 21:01:28 +00:00
Chris Paulo
3b2b23e5e2
vibrator: Fix scaling logic for felix vibrator
...
Felix vibrator has stricter primitive effect scaling values. We need to
update the logic to assure that we apply the upper and lower bounds of
the voltage range to avoid brownout and to maximize the usable range.
Bug: 344037610
Flag: EXEMPT bugfix
Test: atest PtsVibratorHalTestSuite \
PtsHapticsTestCases \
VibratorHalCs40l26TestSuite \
VtsHalVibratorManagerTargetTest \
VtsHalVibratorTargetTest \
CtsVibratorTestCases
Test: Verify scale values
Change-Id: Iba8b8115fea01e56105b43f520d32c63ffcf7fd4
2024-08-12 10:59:08 -07:00
Chris Paulo
42ebfa74b9
vibrator: Update polling timeout to 50ms
...
Update the polling timeout to match that of main vibrator HAL. The
polling timeout is too short, and will cause reset logic to run if the
bus is busy.
Bug: 348364432
Flag: EXEMPT bugfix
Test: atest PtsVibratorHalTestSuite \
PtsHapticsTestCases \
VibratorHalCs40l26TestSuite \
VtsHalVibratorManagerTargetTest \
VtsHalVibratorTargetTest \
CtsVibratorTestCases
Change-Id: I31dac8f1693eda8f1a5bac8420aaa7c0d11781fa
2024-08-12 10:59:08 -07:00
Xin Li
5d40c09b2d
Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future
2024-08-12 17:14:18 +00:00
Sam Ou
cc2b786053
Merge "thermal: Remove bcl related tzones" into main
2024-08-12 12:32:35 +00:00
Leonard Ian
651fde2c0a
Merge changes Ifa8f197f,Ifacc94db into main
...
* changes:
vibrator: common: Check whether file is opened correctly
vibrator: cs40l26: Implement braking duration for haptic effects
2024-08-12 06:45:49 +00:00
Cyan_Hsieh
a42feaf189
update OWNERS to include Android.bp am: 3286919c55
am: a28a8a824e
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/3211863
Change-Id: I81b3048d9ef69a4db99cc177486ddf599f2a0d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 11:07:33 +00:00
Cyan_Hsieh
a28a8a824e
update OWNERS to include Android.bp am: 3286919c55
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/3211863
Change-Id: I0e9c1aeb1f23ed8d6ad1faaf450c1a22b59977f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 10:49:01 +00:00
Cyan_Hsieh
3286919c55
update OWNERS to include Android.bp
...
Flag: EXEMPT only changing OWNERS
Bug: 357036384
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c3a2458c2b16735c76f717a9968b7f857e8de71b )
Merged-In: I5dd6aceaeccb3c5ade2c3234b2a4e371ac8f95d4
Change-Id: I5dd6aceaeccb3c5ade2c3234b2a4e371ac8f95d4
2024-08-09 08:33:24 +00:00
Xin Li
f10b8dce08
Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future
...
Bug: 347831320
Merged-In: I60fb3fb1d4ddae9ce7a3b07a5392b12e76c388dc
Change-Id: I30478255fddb311c135448f9925abf8f1c30f788
2024-08-08 11:15:40 -07:00
samou
697c73328c
thermal: Remove bcl related tzones
...
Flag: EXEMPT tuning changes
Bug: 349935208
Test: Confirm boot
Change-Id: I9162338b20afd9b5d4472d8a7176c69e04ce0175
Signed-off-by: samou <samou@google.com>
2024-08-06 07:40:49 +00:00
Lokesh Kumar Goel
ee973de330
Merge "felix: Add build_flags based properties for SMR/EMR build" into main
2024-08-06 02:13:44 +00:00
Treehugger Robot
fcfc990b28
Merge "haptics: Update output distortion gain" into main
2024-08-03 01:59:59 +00:00
leonardian
1d29f93863
vibrator: common: Check whether file is opened correctly
...
- Add compile-time type checking inside the has() function to ensure it
receives the correct type.
- Add is_open() inside the has() function.
Bug: 350911314
Test: alarm, ringtone vibrations
Test: keyboard vibrations
Test: idlcli commands
Test: atest PTS, CTS, VTS
Flag: EXEMPT bugfix
Change-Id: Ifa8f197f6f4b25d51b2edaf6fec27a086bd4f73c
2024-08-02 12:55:23 +08:00
leonardian
0dcee74707
vibrator: cs40l26: Implement braking duration for haptic effects
...
1. Add sysfs nodes for querying braking duration
- braking_time_bank
- braking_time_index
- braking_time_ms
2. Set delay time between effects to include the whole braking duration
3. Add braking effect durations in HAL dumpsys logs
Bug: 325121485
Test: Plotted acceleration
Test: Checked HAL dumpsys
Test: atest VibratorHalCs40l26TestSuite
Flag: EXEMPT bugfix
Change-Id: Ifacc94db4224adbab971e8d2c01c54422838760c
Signed-off-by: leonardian <leonardian@google.com>
2024-08-02 12:48:19 +08:00
Chris Lu
a33d70164d
Upgrade IDisplay to V13
...
Bug: 315496839
Flag: EXEMPT bugfix
Test: build pass
Change-Id: I3039f3c843b03f0df46e952d6c7f28fd8b3e101e
2024-08-02 04:30:37 +00:00
Lokesh Kumar Goel
ae27f1a5b6
felix: Add build_flags based properties for SMR/EMR build
...
Flag: build.RELEASE_IS_SMR
Flag: build.RELEASE_IS_EMR
Flag: build.RELEASE_BASE_OS_FELIX
Bug: 155105803
Change-Id: Ib2db14ae61d914ee8bc9619058753dbd8a81f0cf
2024-07-31 16:58:59 +00:00
Chris Paulo
c64871377f
haptics: Update output distortion gain
...
Recommended output distortion gain is 0.52.
Bug: 328799172
Test: getprop | grep hapticgenerator
Flag: EXEMPT bugfix
Change-Id: I7ca1ca0186ad9d76d0ef9db604fdbdbbf02103ce
2024-07-30 10:49:57 -07:00
guibing
7eeceadfac
Adpf:felix: switch to multitier heuristic boost.
...
Bug: 344685639
Test: Checked the trace file running on the device.
Flag: NONE powerhal doesn't have a flag yet
Change-Id: I1b37c1e71eb148a4dab454b7e7db9cf46f09d9a3
2024-07-26 23:19:57 +00:00
Android Build Coastguard Worker
b3dccf3ec2
Merge cherrypicks of ['googleplex-android-review.googlesource.com/27586231', 'googleplex-android-review.googlesource.com/26824328', 'googleplex-android-review.googlesource.com/28319518'] into 24Q3-release.
...
Change-Id: I82cb048cb14119b6b3c47a2e1aed3b4cf97e213a
2024-07-25 04:16:25 +00:00
Ankur Bakshi
411eed6900
Update felix SVN to 54
...
Bug:352170103
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:36015c810ee6ebe7cc9a9b2dad3e9b85ccae47ab )
Merged-In: I60fb3fb1d4ddae9ce7a3b07a5392b12e76c388dc
Change-Id: I60fb3fb1d4ddae9ce7a3b07a5392b12e76c388dc
2024-07-25 04:04:56 +00:00
Lokesh Kumar Goel
0235c55b83
felix: Use build_flags for SVN
...
Flag: build.RELEASE_SVN_FELIX
Bug: 332726030
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:87907f0071ae7ec6f81de189bf895d4fc6eee494 )
Merged-In: Icdf9198885ba0fa9c02bd161e2b2ff45927aa8a0
Change-Id: Icdf9198885ba0fa9c02bd161e2b2ff45927aa8a0
2024-07-25 04:04:44 +00:00
Ankur Bakshi
b279a1ac96
Update felix SVN to 53
...
Bug: 342381152
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bc25286b64b9c867c3638196002a7b70ac69ac62 )
Merged-In: I21048d04ff40b1237bcf3d8258b3a3263394fe42
Change-Id: I21048d04ff40b1237bcf3d8258b3a3263394fe42
2024-07-25 04:04:31 +00:00
Ankur Bakshi
f9e0de5fa4
Merge "Update felix SVN to 54" into main
2024-07-18 21:44:23 +00:00
Kyle Hsiao
2a59cf1891
Update antenna position coordinates
...
Bug: 353895373
Test: manual
Flag: EXEMPT bugfix
Change-Id: Ia89d2c410164ec44fde3d6400be8f38b24aa625d
2024-07-18 13:07:56 +00:00
Ankur Bakshi
36015c810e
Update felix SVN to 54
...
Bug:352170103
Change-Id: I60fb3fb1d4ddae9ce7a3b07a5392b12e76c388dc
Flag: EXEMPT bugfix
2024-07-15 14:17:33 +00:00
Lokesh Kumar Goel
36db21a9ce
Merge "felix: Use build_flags for SVN" into main
2024-07-12 18:00:40 +00:00
Koli Lin
c004bba0e7
add device id
...
Test: manual
Bug: 316248308
Flag: EXEMPT prop value only update
Change-Id: I1f929402d041541a1ad95673cd9e0346fdbe4122
2024-07-09 08:59:01 +00:00
Treehugger Robot
df0899088c
Merge "gps: Set configuration by kernel version" into main
2024-07-02 06:51:49 +00:00
Lokesh Kumar Goel
87907f0071
felix: Use build_flags for SVN
...
Flag: build.RELEASE_SVN_FELIX
Bug: 332726030
Change-Id: Icdf9198885ba0fa9c02bd161e2b2ff45927aa8a0
2024-06-27 23:05:13 +00:00
Cheng Chang
eaeec92303
gps: Set configuration by kernel version
...
Bug: 258364350
Test: Verification at b/258364350.
Test: Function verification at b/258364350.
Test: Compile and verify the configuration is correct.
Change-Id: I0e5426dadc03e8f1681fc8b99aa2abd7bf0b6d27
2024-06-25 10:11:16 +00:00
Barry
c24bdaad26
BT: update LEA unicast allowlist: SONY
...
Add Sony WF-1000XM5 into unicast default allowlist.
bug: 349296638
Test: Build and check system property
Flag: NONE alowlist extension
Change-Id: If6a2eec7576ff89d0e4be3f6fab0c2c2adcf13e4
2024-06-25 09:55:17 +00:00
Xin Li
e892403259
[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 1a62a84fb3
-s ours
...
am skip reason: Merged-In Ia51b1745f14bda22629e05cd33f6c807cf6f6565 with SHA-1 22b192c34a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/27907050
Change-Id: I0fac19b3da694b50c524fbadc21cbd733d609645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 19:56:57 +00:00
Xin Li
1a62a84fb3
Merge 24Q3 (ab/11976889) to aosp-main-future
...
Bug: 347831320
Merged-In: Ia51b1745f14bda22629e05cd33f6c807cf6f6565
Change-Id: I13397dc93b0fee76f441fa32aedd23ac7828d450
2024-06-18 14:13:22 -07:00
Xin Li
7c4f210d5d
[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 2a16a2c557
-s ours am: ad366f7631
-s ours
...
am skip reason: Merged-In I4e10554e6f7abbac2e06953c68bfba6f7ffe77d3 with SHA-1 a24eb002fd
is already in history
Original change: https://android-review.googlesource.com/c/device/google/felix/+/3131976
Change-Id: Iefc9f3af55c2ad5ee69b06d47e2f4788dc010778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-18 05:55:28 +00:00
Xin Li
ad366f7631
[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 2a16a2c557
-s ours
...
am skip reason: Merged-In I4e10554e6f7abbac2e06953c68bfba6f7ffe77d3 with SHA-1 a24eb002fd
is already in history
Original change: https://android-review.googlesource.com/c/device/google/felix/+/3131976
Change-Id: Ie3bc848a2248a2aee0f041b3f9fc2fd635d99df0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-17 20:41:51 +00:00
Ankur Bakshi
eb11811dfd
Merge "Update felix SVN to 53" into main
2024-06-17 05:04:32 +00:00
Android Build Coastguard Worker
4350ca50fd
Snap for 11967491 from f7e56e0dd5
to 24Q3-release
...
Change-Id: I2269a6b96c70bc720662d0f3a4c2a9d4b3d87c7d
2024-06-13 23:01:59 +00:00
Xin Li
2a16a2c557
Merge Android 14 QPR3 to AOSP main
...
Bug: 346855327
Merged-In: I4e10554e6f7abbac2e06953c68bfba6f7ffe77d3
Change-Id: I53bf20ef8d2ccf02642adeaadc0d2b2f77a0dd24
2024-06-13 10:48:14 -07:00
Michael Wright
f7e56e0dd5
Merge "Use singular OWNERS file." into main
2024-06-13 17:13:21 +00:00
Michael Wright
22b192c34a
Use singular OWNERS file.
...
Rather than every project having an OWNERS with explicit people, just
use one centralized OWNERS file and have every other OWNERS reference
that. This way when the team changes there's only one place that needs
to be updated.
Bug: 346876927
Test: N/A
Flag: EXEMPT OWNERS change
Change-Id: Ia51b1745f14bda22629e05cd33f6c807cf6f6565
2024-06-13 14:47:44 +01:00
Android Build Coastguard Worker
3be7dcb9d4
Snap for 11959661 from 0cd2ae5985
to 24Q3-release
...
Change-Id: Ic4e89b7ab2f8800fd6060b7ad936593c73bd60c5
2024-06-12 23:02:20 +00:00