Commit graph

3650 commits

Author SHA1 Message Date
Tai Kuo
46065a4462 vibrator/cs40l26: update default scales of click, tick and long vib
Flow:
1. If the calibration file exist, use the value.
2. If no property, use the default setting {5,95}.

Bug: 356823441
Bug: 322937989
Test: Check dumpsys records for the scaling results.
  case1: no calibration file and properties.
  case2: valid property range
  case3: float property (invalid)
Flag: EXEMPT bugfix
Change-Id: Ia3e89f34189e9725ab01d85d931925129745608c
(cherry picked from commit 4063493a64fcd0f20b49a492106f58b0e3349c5c)
2024-10-22 20:50:23 +08:00
Ali K. Zadeh
03e46a5e0f Merge "[felix] Define CAMERA_MULTICAM_BOOST" into main 2024-10-15 23:10:58 +00:00
Treehugger Robot
f8f3aaf665 Merge "vibrator: correct debug() calibration file path" into main 2024-10-15 20:58:48 +00:00
Tai Kuo
f0ebfabee8 Update OWNERS am: 3f7ccdf45f am: 3e14bb76f4
Original change: https://android-review.googlesource.com/c/device/google/felix/+/3309623

Change-Id: I1269e5f44491cde4442c02695abc768602892710
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 20:15:42 +00:00
Tai Kuo
3e14bb76f4 Update OWNERS am: 3f7ccdf45f
Original change: https://android-review.googlesource.com/c/device/google/felix/+/3309623

Change-Id: Ibbcef482c38a722c250ea2d0f2b56095d4ca6a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 19:55:46 +00:00
Tai Kuo
3f7ccdf45f Update OWNERS
Bug: 362659323
Test: N/A
Flag: EXEMPT OWNERS change
Change-Id: I6e2148448f1105933d66cec57cb879054657eeda
2024-10-16 00:58:23 +08:00
Tai Kuo
c5a772a3f2 vibrator: correct debug() calibration file path
Bug: 356823441
Test: dumpsys
Flag: EXEMPT bugfix
Change-Id: I2d126e63ae7365b4bd199d00776f10b11c700702
2024-10-15 20:27:45 +08:00
Eileen Lai
9c9f564b77 modem_svc: use shared_modem_platform to replace all modem_svc_sit
Bug: 368257019

Flag: NONE local testing only
Change-Id: Ic54f0cbc895de8ba038cb581d055287768c1e23a
2024-10-09 07:55:28 +00:00
Treehugger Robot
70c67ccdb5 Merge "felix: Pull init.insmod.*.cfg from vendor_dlkm" into main 2024-10-08 22:15:21 +00:00
Brian Norris
32a1b78620 felix: Pull init.insmod.*.cfg from vendor_dlkm
We've started pushing init.insmod.*.cfg into the kernel prebuilts, and
installing it to /vendor_dlkm/etc, but it may not be available on all
prebuilt variants (e.g., kernel 5.10).

Here, we:
1. conditionally install our common init.*cfg to /vendor_dlkm (only if
   $(TARGET_KERNEL_DIR) doesn't have a copy)
2. point init at /vendor_dlkm/etc

When we've cycled completely off of kernel 5.10, we can drop #1.

Bug: 369686096
Test: build, boot
Flag: EXEMPT refactor
Change-Id: If8f879366645cbe9bf330d136dd7190763b2d6bc
2024-10-08 20:12:15 +00:00
Jim Tang
da210da2f2 Merge "Move modem_svc_sit from gs201 to felix" into main 2024-10-07 08:45:20 +00:00
Ravi Jain
583f46ea0a Merge "vibrator: Update location of PixelVibratorFlags" into main 2024-10-07 06:57:59 +00:00
Jim Tang
17e4c0262f Move modem_svc_sit from gs201 to felix
Module `modem_svc_sit` is not valid unless:
* USES_LASSEN_MODEM is true
* BOARD_WITHOUT_RADIO is NOT true (or NOT set)

Devices in gs201 family will set "USES_LASSEN_MODEM := true"; however,
not evevy gs201 device disables BOARD_WITHOUT_RADIO.

This commit defines PRODUCT_PACKAGES `modem_svc_sit` because it is
converted from bp by moving the if-statement constrain from the module
level to device level, device-felix.mk in this case.

Flag: EXEMPT refactor
Bug: 358485346
Test: m modem_svc_sit
Change-Id: Ib57ffeb545ca52eea47f2415c7ce020ba73f2c24
2024-10-04 08:58:54 +00:00
Treehugger Robot
e09b97327d Merge "dumpstate: touch: Init using touch_predump" into main 2024-10-02 08:57:00 +00:00
Treehugger Robot
5644762c10 Merge "vibrator: Format PWLE header in user driver" into main 2024-10-02 03:17:08 +00:00
Ravi Jain
810423348e vibrator: Update location of PixelVibratorFlags
Temporary move the definition from main repository to manage visibility
and prevent aosp without vendor build fails

Bug: 362659323
Test: Build pass
Flag: EXEMPT refactor
Change-Id: Ie3bb23838743df1f75261fd530652dcf55b6a643
2024-10-01 15:31:33 +00:00
Grzegorz Kolodziejczyk (xWF)
ece926a269 Merge "audio: enable software encoded Bluetooth broadcast" into main 2024-10-01 12:30:35 +00:00
Wayne Lin
ea53f43031 gps: set default SUPL SSL method to SSLv23
Bug: 363886476
Test: verify SUPL NI test pass
Change-Id: I56f0139c748a3a04df9f3998653121948846c8fe
2024-09-24 05:45:20 +00:00
Grzegorz Kołodziejczyk
c45009ef12 audio: enable software encoded Bluetooth broadcast
Bug: 345372436
Test: manual
Flag: EXEMPT, trivial change
Change-Id: I8e84fca69260a3be6d797ccb0d25b3032dac2bee
2024-09-20 08:29:34 +00:00
Treehugger Robot
2f4a8c042d Merge "gps: Enable Beidou measurements only in the US for F10." into main 2024-09-11 08:36:12 +00:00
Xin Li
2035632a2a [automerger skipped] Merge 24Q3 to AOSP main am: c62cecbadb -s ours am: 65e3fdb6ce -s ours
am skip reason: Merged-In I60fb3fb1d4ddae9ce7a3b07a5392b12e76c388dc with SHA-1 411eed6900 is already in history

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

Change-Id: I7283236099c4fd8e256b7a7aa4ea62fc9197d0eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 05:01:50 +00:00
Xin Li
65e3fdb6ce [automerger skipped] Merge 24Q3 to AOSP main am: c62cecbadb -s ours
am skip reason: Merged-In I60fb3fb1d4ddae9ce7a3b07a5392b12e76c388dc with SHA-1 411eed6900 is already in history

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

Change-Id: I3fcfac340d487f0ca43c94aa838e663352524bbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 03:27:51 +00:00
Treehugger Robot
342b6c285b Merge "Symlink current prebuilt folder to android root" into main 2024-09-06 10:36:12 +00:00
Koli Lin
a42bff7938 Update product id for Felix
Test: manual
Bug: 316248308
Flag: EXEMPT prop value only update
Change-Id: I57bbf91eb9ce9c35a103cfc54f9a6f2002eba54a
2024-09-06 07:50:05 +00:00
Robin Peng
3e925e4349 Symlink current prebuilt folder to android root
The Android are now based on Trunk Stable world and Pixel prebuilts CLs
also needs to reply with this which controlled by the flag which results:
- the flag value might be different on each branches
- the flag value are mostly different on each release configuration
- for local builds, ENGs' needs to figure out the correct location
  of current prebuilts by checking through entire prebuilt textproto
  files

To alleviate this problem, create an symlink file under android root
indicates current prebuilt path after invoke the android lunch cmd.

Bug: 364831620
Flag: EXEMPT export current prebuilt path
Change-Id: I08d009b79c5d15c078bfbeb3f191271e154cd508
Signed-off-by: Robin Peng <robinpeng@google.com>
2024-09-06 07:35:11 +00:00
Xin Li
c62cecbadb Merge 24Q3 to AOSP main
Bug: 357762254
Merged-In: I60fb3fb1d4ddae9ce7a3b07a5392b12e76c388dc
Change-Id: Idae800eaefc02e5a81b02f21ee7920200d5860ca
2024-09-05 17:02:36 -07:00
Treehugger Robot
14484bec22 Merge "powerhint: Raise minimum MIF frequency to 546 MHz during screen on" into main 2024-09-04 04:16:15 +00:00
Leonard Ian
09d11a02b0 Merge "cs40l26: Align Felix HAL dump logs with common HAL" into main 2024-09-02 09:04:25 +00:00
Nathan Kulczak
7105ca38e8 vibrator: Format PWLE header in user driver
Add PWLE header formatting to user side driver to support new kernel
driver and SVC and DVL for OWT effects.

Bug: 279055885
Bug: 361011775
Flag: EXEMPT bugfix
Test: idlcli
Change-Id: I3b447962cc46ab57cf145072bc30303786f581ad
Signed-off-by: Nathan Kulczak <nathankulczak@google.com>
2024-09-02 15:06:34 +08:00
leonardian
a644ef2a33 cs40l26: Align Felix HAL dump logs with common HAL
- Add driver, firmware, and tuning versions.
- Increase HAL buffer size to 2048 lines.
- Add F0, active ID, redc

Bug: 348316804
Flag: EXEMPT bugfix
Test: Checked HAL dumpsys
Test: atest PTS, VTS, CTS
Change-Id: I277d270533868cf2075388bdc329d77c9065801e
2024-08-30 04:33:59 +00:00
Ankit Goyal
777bc1274f Delete mapper4 manifest
Bug: 362183626
Flag: EXEMPT manifest update
Test: Boot to home on shiba
Change-Id: I1882a688138455538418b01b38084b5dfb2dd802
2024-08-28 22:52:54 -07:00
Chungkai Mei
d37470ea6e powerhint: Raise minimum MIF frequency to 546 MHz during screen on
It improved 55% surfaceflinger janks in photos_playgca30fpsvideo cuj test case.

Test: Build and power measurement
Bug: 336872050
Flag: NONE powerhint change does not support flags
Change-Id: Idad3394e5ac9d1d275f144e2d1304a115b7dc3af
Signed-off-by: Chungkai Mei <chungkai@google.com>
2024-08-23 01:35:02 +00:00
Wayne Lin
ed543a25e3 Merge "gps: add CpEarlyFixGuardTimeSec to prevent earlyfix response delay" into main 2024-08-20 02:41:29 +00:00
Wayne Lin
5524ba6a07 gps: add CpEarlyFixGuardTimeSec to prevent earlyfix response delay
Bug: 358041425
Test: verify pass
Change-Id: Idddb3d7968b93ebb214d1dd2938be2b1aaff8ea9
2024-08-19 10:04:11 +00:00
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