Commit graph

189 commits

Author SHA1 Message Date
Jooyung Han
9eca80bd16 Merge "Revert submission" 2019-12-18 01:03:48 +00:00
Jooyung Han
716648deb4 Revert submission
Reason for revert: Trying to reland the changes with fix for build errors.

Change-Id: I64a9f6091a53ffb15433b8c5ff22b6a1b9cd01e8
2019-12-17 14:17:48 +00:00
Jooyung Han
91770e0381 Merge "Revert submission" 2019-12-17 08:47:50 +00:00
Jooyung Han
61d357ebce Revert submission
Reason for revert: b/146402634

Change-Id: Ibaf2854bc5cbe63f557dcf63be9e285ef6678bd3
2019-12-17 08:36:07 +00:00
Jooyung Han
74b4460f28 Merge "vibrator: Use enum_range<Enum>" 2019-12-17 06:10:59 +00:00
Jooyung Han
9bce98b45a vibrator: Use enum_range<Enum>
to avoid accidental omission of Effect/EffectStrength in test

Bug: 143992652
Test: VtsHalVibratorTargetTest
Change-Id: I0894a7bb426d134b052d43ef9a9f55ace8146a44
2019-12-13 15:39:19 +09:00
Harpreet \"Eli\" Sangha
63624099e3 vibrator: Support Always-On Effects
Bug: 138909021
Test: Verify always-on haptics are configured on boot and settings
      change.
Change-Id: I11ce5f2b974267c6e84b1843a750847492a7de15
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-12-12 11:09:06 +09:00
Treehugger Robot
e995668691 Merge "vibrator: aidl: Add Descriptions for Primitives" 2019-12-11 22:19:46 +00:00
Harpreet \"Eli\" Sangha
63c06d62d7 vibrator: aidl: Add Descriptions for Primitives
Test: Build
Change-Id: I05d43cb75d6c7cf9ece95a3c7d1ee9ce9980cebb
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-12-10 15:44:19 +09:00
Harpreet \"Eli\" Sangha
e1723a49df vibrator: vts: Utilize New toString() Support
Use the new toString() support for AIDL enums for improved logging.

Test: atest VtsHalVibratorTargetTest
Change-Id: Ie9d98f6b9f367dec9e6f0b9b0ed18dab0a32c742
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-12-10 14:52:59 +09:00
Steven Moreland
cd99e3f2eb Merge "Mark VINTF AIDL w/ Java as platform_apis." 2019-12-02 16:46:17 +00:00
Steven Moreland
18576b0b27 Mark VINTF AIDL w/ Java as platform_apis.
Since this requires platform-only APIs (markVintfStability).

Bug: 139325468
Test: use vibrator callback from Java
Change-Id: Ic675c82973e04f80db67da1b9c69964ef33b35f7
2019-11-27 18:11:43 -08:00
Steven Moreland
f57ad9ba5c vibrator impl: log failed callback
As help/sanity check when debugging.

Bug: N/A
Test: N/A
Change-Id: Ia45be148f1e6aebdb880d7da68d5b8bec8485127
2019-11-27 16:04:52 -08:00
Treehugger Robot
677cdb4b0e Merge "vibrator: Add Composition APIs" 2019-11-27 06:43:42 +00:00
Steven Moreland
2fb810f495 Merge "vndk vintf vibrator" 2019-11-25 17:31:26 +00:00
Harpreet \"Eli\" Sangha
f4de5b065f vibrator: Add Composition APIs
Bug: 139762802
Test: Manual Invocation via 'idlcli'
Change-Id: Ibc938d08f186039681d523784b90f4172a52af51
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-11-21 16:12:13 +09:00
Steven Moreland
716868f7fd Merge "Remove vibrator@1.4" 2019-11-20 16:46:33 +00:00
Steven Moreland
d5cff19c5e vndk vintf vibrator
Bug: 141828236
Test: TH
Change-Id: I6fd418008f4695cae8f4ffd8547b6ea28fa195fa
2019-11-19 18:20:14 -08:00
Steven Moreland
028bb37546 Merge "example AIDL HAL extension" 2019-11-19 18:15:05 +00:00
Steven Moreland
4184cfbdc7 Remove vibrator@1.4
Since this HAL was converted to AIDL.

Bug: 141828236
Test: N/A
Change-Id: I99cf08ea524b451278dfeeb3ca31f3a76e1a416e
2019-11-18 19:22:00 -08:00
Steven Moreland
c8ddf2fea6 vibrator: enable vintf java
So constants can be used from Java.

Bug: 136027762
Test: compile
Change-Id: I3381703b80ec168688a67cf9c07d598ce881be55
2019-11-18 19:22:00 -08:00
Steven Moreland
8ba8c03a49 example AIDL HAL extension
This CL shows an example of how to use and retrieve a HAL extension.

Bug: 136027762
Test: run HAL and:
- use "dumpsys --pid android.hardware.vibrator.IVibrator/default" to
make sure that the HAL I'm running is the binary being added.
- VtsHalVibratorTargetTest
- test-vintf-vibrator-ext-client

Change-Id: I8614007a727e8e05ba4667c2cd1623ce936a1609
2019-11-18 18:02:12 -08:00
Steven Moreland
5aca9f6f40 Merge changes from topic "rm-vibrator-1-4"
* changes:
  vibrator@1.4: remove from current.txt
  Remove vibrator@1.4 from VNDK.
  Restore vibrator@1.3 example service.
2019-11-12 21:39:26 +00:00
Steven Moreland
ea49733bb4 Merge "vibrator: clarify behavior for repeated commands" 2019-11-11 06:58:07 +00:00
Steven Moreland
d13b7577e1 Merge "vibrator: fix VTS for effects" 2019-11-11 05:28:38 +00:00
Steven Moreland
1784b9a3cf Remove vibrator@1.4 from VNDK.
Because this HAL was converted to AIDL.

Can't be completely removed until frameworks/base is refactored not to
use it, but doing this so no more dependencies are accidentally taken
downstream.

Bug: 141828236
Test: N/A
Change-Id: Ic920f59a1a0ad933e5c80c468700ef4514b4a9c9
2019-11-10 20:21:23 -08:00
Steven Moreland
cb5d107734 Restore vibrator@1.3 example service.
To ensure we still have a HIDL vibrator service around for testing.
This is from running command:
    git checkout 714220ef75707d826371c6c020c45663d6965f0c^ -- \
        vibrator/1.3/example

Bug: 141828236
Test: N/A
Change-Id: Iffd5c8d4b95466f1b7b277c9f69d9a6001f12db8
2019-11-10 20:20:48 -08:00
Steven Moreland
c02bc05977 vibrator: clarify behavior for repeated commands
Bug: 141828236
Test: VtsHalVibratorTargetTest
Change-Id: I4077ca34cb037198df16149f944beba3c5633175
2019-11-11 04:04:11 +00:00
Treehugger Robot
a7e5d5fd5b Merge "Fix build with new googletest" 2019-11-09 01:06:56 +00:00
Haibo Huang
83b4c1e3e1 Fix build with new googletest
The new googletest requires prefix to be non-empty.

Change-Id: I3ebd13861c4803b53dbeb4ac5f247984814bef45
2019-11-08 12:17:34 -08:00
Steven Moreland
f33538889f vibrator: fix VTS for effects
A few issues were causing effects tests to fail:
- invalid effects were not actually invalid
- test for invalid effects improved to consider invalid effects and
  strengths separately
- test sleeps for appropriate amount of time after requesting effect to
  be performed
- logging used to diagnose issues left in place for convenience

Bug: 141828236
Test: atest VtsHalVibratorTargetTest (on device which suffers from these
  issues that cf did not hit)

Change-Id: Id220d36c27d85f068dce6b8961f705eef8dc6a4f
2019-11-08 10:24:34 -08:00
Steven Moreland
c0b92d5388 vibrator: add CAP_EXTERNAL_AMPLITUDE_CONTROL
For HIDL, vibrator may change the value of supportsAmplitudeControl
based on context. Since the interface is being redone in AIDL, we're
avoiding this changing value and providing capabilities for amplitudes
we expect to be available in different states.

Bug: 141828236
Test: VtsHalVibratorTargetTest
Change-Id: Idf0b28ffe5b1175469d32e790b10b4232482dc2b
2019-11-07 03:00:25 +00:00
Steven Moreland
2932b22571 vibrator: add getSupportedEffects
It's a real gap in this interface, since we need to call perform to
understand if an effect is supported.

Bug: 141828236
Test: atest VtsHalVibratorTargetTest
Change-Id: Iffbd9c0acf5e4c368767c7718025a4aef8f44ce3
2019-11-06 16:34:37 +00:00
Steven Moreland
d91e449020 s/staidl/aidl/
staidl is a term I made up w/o precedence. aidl is clearer and more
consistent w/ practices elsewhere.

Bug: 141828236
Test: N/A
Change-Id: I3f044ddf470b63956f2aa496ae9fe9e5893f479a
2019-11-05 13:29:10 -08:00
Steven Moreland
d44007e625 Vibrator: Stable AIDL interface.
This is from running:
hidl2aidl android.hardware.vibrator@1.4

and then making several small modifications.

Bug: 141828236
Test: dumpsys on cf
Change-Id: I612e903c1e3f63f0470f8e5c827345c5b67d5645
2019-10-30 12:26:22 -07:00
Treehugger Robot
48141f00ab Merge "[vts-core] add VtsHalVibratorV1_*TargetTest to vts-core" 2019-10-23 02:02:04 +00:00
nelsonli
10976957e7 [vts-core] add VtsHalVibratorV1_*TargetTest to vts-core
Convert VtsHalVibratorV1_*TargetTest to be parameterized test
and add it to vts-core

Bug: 142397658
Test: $atest VtsHalVibratorV1_0TargetTest
      $atest VtsHalVibratorV1_1TargetTest
      $atest VtsHalVibratorV1_2TargetTest
      $atest VtsHalVibratorV1_3TargetTest
Change-Id: Ied47225bf40cce99648200b79cd7dd65e5222394
2019-10-23 02:00:22 +00:00
Treehugger Robot
aae0b8d093 Merge "vibrator: Add 1.4 Tests to 'vts-core'" 2019-10-21 23:10:15 +00:00
Treehugger Robot
3ff034b3e1 Merge changes from topic "vibrator-hal-1.4-vts"
* changes:
  vibrator: Limit Length of Async Callback Tests
  vibrator: Async Callback API VTS Tests
2019-10-18 21:19:20 +00:00
Harpreet \"Eli\" Sangha
8e08e377eb vibrator: Add 1.4 Tests to 'vts-core'
Test: Build
Change-Id: I288417d30158bdf8109bf58da7415681ce66c19c
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-10-17 03:52:23 +09:00
Harpreet \"Eli\" Sangha
8cb24487a0 vibrator: Limit Length of Async Callback Tests
Don't wait for callbacks for long effects, as determined by a
command-line option.

Bug: 136220871
Test: VTS Tests
Change-Id: Ibaf3072a38b32b159d7b48a40860a25928c5d6f1
Merged-In: Ibaf3072a38b32b159d7b48a40860a25928c5d6f1
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-10-17 03:48:59 +09:00
Harpreet \"Eli\" Sangha
00811c57d4 vibrator: Async Callback API VTS Tests
Bug: 136220871
Test: VTS Tests
Change-Id: Icd8f794df76542c9f74e3ea762117da703db47d4
Merged-In: Icd8f794df76542c9f74e3ea762117da703db47d4
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-10-17 03:48:59 +09:00
Harpreet \"Eli\" Sangha
714220ef75 vibrator: Async Callback API Example
Bug: 136220871
Test: VTS Tests
Change-Id: I338f16d72cd7b1ba60ddf812e4cb87a6011de752
Merged-In: I338f16d72cd7b1ba60ddf812e4cb87a6011de752
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-10-15 02:10:09 +09:00
Harpreet "Eli" Sangha
8502c2fd7c vibrator: Support Async Callback APIs
Bug: 136220871
Test: Manually via 'cmd vibrator'
Change-Id: I4201538e4b2e663ac0215c1deb1047658f4d602e
2019-10-09 13:52:54 +09:00
Steven Moreland
b3a4d3832e Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I075670b64eebbbbd6a6ae0e84ad51bf1c6f5ba36
2019-09-06 01:07:02 +00:00
Felix
37298a7616 Merge "Add interface info to .rc files"
am: 98d0f4d52c

Change-Id: Ie6cfbacd523c4b09f77bee3369ec8e88b3fa0419
2019-07-08 12:22:23 -07:00
Felix
551b8d15ce Add interface info to .rc files
Signed-off-by: Felix <google@ix5.org>
Change-Id: I6d70bbdb66c3dce280bf6908c3750316a6f6cf70
2019-06-25 20:00:07 +02:00
TreeHugger Robot
691bc8d406 Merge "Update hidl makefiles for bpfmt" into qt-dev-plus-aosp 2019-04-19 23:23:13 +00:00
Harpreet "Eli" Sangha
fd6d0687b3 Merge "vibrator: vts: Add Bad Effect/Strength Checks" into qt-dev
am: 756c68e0b6

Change-Id: Ic7b22f7e776e330ef6309ac83ff973bca0958579
2019-04-19 02:38:07 -07:00
Steven Moreland
99712c08cc Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I53e5bf67a0d314e1b10c0ba0c7172a7af358ddcc
2019-04-18 18:13:05 -07:00