Commit graph

65 commits

Author SHA1 Message Date
Nick Desaulniers
e637aa32b8 biometrics: fingerprint: add locking to default impl
There exists the following race condition:
a). thread A receives setNotify and sets the callback to some object
b). thread B of the wrapped implementation calls
BiometricsFingerprint::notify which it was given a handle to. Thread B
executes past the nullptr check:
c). thread A receives setNotify and sets the callback to some other
object (or nullptr)
d). thread B resumes in notify with unknown state

Add mutex to protect access to mClientCallback.

Change-Id: I9163204ff5802e9246056caeb2a7857e6138531c
Fixes: 64802340
Test: VtsHalBiometricsFingerprintV2_1IfaceFuzzer
2017-08-18 17:14:53 +00:00
Tri Vo
0c2ce357b1 VTS tests now static link to HAL def libs. #2
And use VtsHalTargetTestDefaults.

Bug: 64040096
Test: crop out all non-affected tests from vts-hal-hidl.xml and run
vts-tradefed run commandAndExit vts-hal-hidl --skip-all-system-status-check 
--skip-preconditions
2 failures, same as without this change:
GatekeeperHidlTest.DeleteAllUsersTest
GatekeeperHidlTest.DeleteUserTest

Change-Id: I8f6995e9536a9aefe283ee3effec9f5a7f03b620
2017-08-10 17:44:57 +00:00
Justin Yun
608d773ef8 Update make file for vndk enabled.
Update the Android.bp generated with hidl-gen.

Test: build with and without BOARD_VNDK_VERSION=current
Bug: 63866913
Change-Id: I1a9db1df49e0f13c5790da2b118ae9ec63ba34a7
2017-08-04 14:12:23 +09:00
Tri Vo
f5d136c231 Update Android.bp HIDL makefiles
Allow HAL definition libs to be static.

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Change-Id: I1483d572bea6799717d1614fb7d52fe225e31104
2017-08-03 00:30:01 +00:00
Steven Moreland
f203167814 Update makefiles. (2/2)
am: 76cfb84140

Change-Id: I24d21438a5b2f447d2160929c6ff6e17b2b66820
2017-05-22 17:15:20 +00:00
Steven Moreland
76cfb84140 Update makefiles. (2/2)
Adds default configuration for all hals.

Bug: 38415912
Test: pass
Change-Id: Idd1f3a2b7b16ad956d31784a513e93a066cdd02e
2017-05-19 15:54:03 -07:00
Steven Moreland
a32ebce372 Update makefiles for c++-sources and c++-headers. (2/2)
am: bc71124120

Change-Id: Icf36068a4d863a8520854c7a83e51f960c188e12
2017-05-11 00:48:55 +00:00
Steven Moreland
bc71124120 Update makefiles for c++-sources and c++-headers. (2/2)
Test: pass
Bug: 38174080
Change-Id: Icad451f9f9ad5f46412356a4171a8a1222f8e545
2017-05-09 19:58:43 -07:00
Steven Moreland
5c63b11f76 Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Merged-In: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
Change-Id: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
2017-05-02 15:29:30 -07:00
Kevin Chyn
10dfcc14dc Add onAcquired log back
It was in fingerprintd, which is replaced now

Fixes: 37677260
Test: touch FP when enrolling/authenticating and make sure
onAcquired log is there

Change-Id: Iadecdfa1c18b0aaa083de18dbe7f701c78465ace
2017-04-25 15:05:32 -07:00
TreeHugger Robot
04b086dd08 Merge "setActiveGroup null, 0 length, unwritable dir should fail" into oc-dev 2017-04-14 23:10:32 +00:00
Kevin Chyn
d7e9b0fdc7 setActiveGroup null, 0 length, unwritable dir should fail
with this change, VTS test needs to run in /data/system/
due to SELinux policy + Linux directory permissions

Test: run VTS tests and make sure they all pass
Fixes 37153318

Change-Id: Ib1f19ce7fc0d08ae2941aec5c08c5857c7a9f2fd
2017-04-14 14:10:19 -07:00
TreeHugger Robot
8afd952d48 Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev 2017-04-14 02:13:28 +00:00
Steven Moreland
750ede4cf9 fingerprint: clean up includes
Bug: 33241851
Test: links
Test: works with BOARD_VNDK_VERSION := current
Change-Id: I7cfec2b8459964edf9a180d01cfdd90dae376fb9
2017-04-13 16:13:47 -07:00
Andreas Huber
6fa374ad30 Changed the naming scheme for Treble java libraries (both static and dynamic)
android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java

Bug: 37207894
Test: make
Change-Id: I177f4cfd42f635aaf096107af8309d1a82ed41c0
Merged-In: I8b91881dfaf507c0d852d56ebbb53ff0987e5a34
2017-04-13 15:23:46 -07:00
Steven Moreland
3b36a83a2e Update makefiles (2/2).
Test: pass
Change-Id: Ic7e6289c7b69785491708ce0acbb657f4c704229
2017-04-11 09:58:03 -07:00
Jim Miller
d361f033d4 Log errno
Bug 36790737

Test: ensure errno is logged
Change-Id: Ifa9a0b6ee0baebfdfce894622ef40888dd83dddf
2017-04-06 17:07:48 -07:00
Andreas Huber
40d3a9bd8c Convert all comments into "doxygen-ready" comments.
Bug: 36453077
Test: mma
Change-Id: I0b1f77dfae5d2258969e33d85ecf45401ffbdfaa
2017-03-29 08:53:58 -07:00
Steven Moreland
561b602a99 Update makefiles for hwtypes.h
Test: pass
Change-Id: I8e17eb8fec5d2f04c526476a866c8dd54ccb556c
2017-03-28 15:18:20 +00:00
Kevin Chyn
dfe3d8186f Fingerprint vts tests.
Fix callback mechanism. Add tests for uncovered interfaces.

Test: make vts && adb push
out/host/linux-x86/vts/android-vts/testcases/DATA/nativetest64/VtsHalBiometricsFingerprintV2_1TargetTest/VtsHalBiometricsFingerprintV2_1TargetTest
/data/local/tmp/ && adb shell
./data/local/tmp/VtsHalBiometricsFingerprintV2_1TargetTest
Bug: 32022721
Change-Id: Ibeb955bfb937d9f23f98a2e073235aa745183e94
2017-03-27 13:33:43 -07:00
Nick Desaulniers
8174a847f2 fingerprint: check return status of hwbinder calls
If system_server dies, and return codes of hwbinder calls are not
checked, an abort of the HAL service will occur.  In this case,
warn in the logs, but allow system_server to reopen HAL.

Bug: 34867134
Change-Id: I9fe1c2c0f1c03e8debafb56bff8a7490ccbbcec0
2017-03-20 14:12:43 -07:00
Yifan Hong
4681ab8b21 IBiometricsFingerprint uses "default" service name
The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.

Test: fingerprint works

Bug: 33844934
Change-Id: I6383c43b4b05469cb986e4f10129a0921f401464
2017-03-16 15:39:08 -07:00
Yuexi Ma
ed2bb4e8f8 Change vts target base test class name
Test: make vts succeed, vts kernel tests and nfc hal tests passed
Change-Id: I95f10ad7a66f261c9030357edd411fe6d94150e8
2017-03-10 21:14:48 +00:00
TreeHugger Robot
ed27972104 Merge "vts: fingerprint: properly set timeouts for tests" 2017-03-09 22:53:45 +00:00
Nick Desaulniers
20ce824289 vts: fingerprint: properly set timeouts for tests
Test:
  make vts;
  adb push
    out/host/linux-x86/vts/android-vts/testcases/DATA/nativetest64/VtsHalBiometricsFingerprintV2_1TargetTest/VtsHalBiometricsFingerprintV2_1TargetTest
    /data/local/tmp/.;
  adb shell /data/local/tmp/VtsHalBiometricsFingerprintV2_1TargetTest

Bug: 32022721
Bug: 34179855
Change-Id: I92ba6157d378fe04b5319b951fa0ef06f6cbaa42
2017-03-09 13:32:10 -08:00
Steven Moreland
48c52249e4 hidl_default to all targets.
find hardware/interfaces -type f -not -path "*/.git/*" \
-exec sed -i -e '/cc_[A-Za-z_]\+/ { N; s/$/\n    defaults:
\["hidl_defaults"\],/ }' {} \;
./hardware/interfaces/update-makefiles.sh

Test: pass
Bug: 35840847
Change-Id: If10c464d2f000b85c8d698fe11a4f3fc4cfad282
2017-03-08 19:31:53 -08:00
Yuexi Ma
50d7e27b3c change all vts hidl tests to use VtsHalHidlTargetBaseTest (internal master)
Bug: 33385836
Test: mma
Change-Id: Ide3ebc4a9db76257f33bcfb0c1f13d2ee33eeaa8
2017-02-28 22:27:28 +00:00
Steven Moreland
7e73d5b908 Remove viral dependency on libhwbinder. (2/2)
find hardware/interfaces -name Android.mk -exec sed -i -e '/libhwbinder
\\/d' {} \;
find hardware/interfaces -name Android.bp -exec sed -i -e
'/"libhwbinder"/d' {} \;
./hardware/interfaces/update-makefiles.sh

Note, automotive has some actual dependencies on libhwbinder, filed
b/35758626 for this.

Test: everything links
Test: (sanity) booted marlin on internal master with these changes
Bug: 35710429
Change-Id: I6d0726c8130d00684b978efbdd48e3ae396f12e5
2017-02-24 12:18:01 -08:00
Tri Vo
d94a7d2df9 Remove .vts spec files
Test: mmma hardware/interfaces
Change-Id: Idae97ce60a6368cfa685ae6b2d71b9ad163e8605
2017-02-22 12:53:52 -08:00
Tri Vo
24602752fa Update makefiles.
Test: mmma hardware/interfaces
Change-Id: Id671b950aabaeb40a7989c094983ccb5c98df528
2017-02-22 12:53:52 -08:00
Zhuoyao Zhang
8422f6aa04 Update the test binary and source file name on master.
* To confirm with Vts naming convention.

Bug: 35273456
Test: mma
Change-Id: I845da64085253cd02480465479618308045a52ed
2017-02-21 20:47:18 -08:00
Ryan Campbell
2caf0a60f3 Remove coverage flags from tests.
Remove unnecessary coverage flags from HAL tests.

Bug: 32749731
Test: none
Change-Id: I7e4e3bce2d9d444bfa8475c140bce2ee7e3b0c0d
2017-02-14 16:50:34 -08:00
Zhuoyao Zhang
f008f8fdc4 Merge "Update .vts files on master based on the latest .hal file and hidl-gen" 2017-02-14 18:51:27 +00:00
Zhuoyao Zhang
3bef939f94 Update .vts files on master based on the latest .hal file and hidl-gen
Test: mma
Change-Id: I9558f300505db83e26f7c241c5cf729cd005a07b
2017-02-13 18:03:06 -08:00
Steven Moreland
a0da1a1c3d Move hidl shims to the vendor partition. (2/2)
We need google shims on the vendor partition because they are providing
an implementation of a vendor defined interface. They were written by
google just as a courtesy/to make the transition easier. They're
basically a set for vendors to assemble their hal implementations
from.

Bug: 34135607
Test: marlin persist.hal.binderization on/off
Change-Id: I2e2af5af39264cf290259755bb9b2eb9827a21f5
2017-02-13 15:03:41 -08:00
TreeHugger Robot
86fa244c12 Merge "Update makefiles to use filgroup syntax." 2017-02-10 23:25:52 +00:00
TreeHugger Robot
b8769344f9 Merge "Fingerprint VTS" 2017-02-10 23:12:54 +00:00
Tri Vo
85120c9490 Update makefiles to use filgroup syntax.
Test: mmma hardware/interfaces
Change-Id: I9f4457c78b7820c242d46359f0debe05d1b3e482
2017-02-10 12:45:19 -08:00
Andreas Huber
d38f147c35 Updated makefiles
Java intermediates are now created in the common rather than the device-
specific generated sources subdirectory.

Bug: 33842609
Test: make
Change-Id: I16af4cd19bf0b24baa0ad9ebfdb86b4d959c8672
2017-02-09 17:20:45 -08:00
Tri Vo
ce608bec74 Migrate driver/profiler to test/vts-testcase/hal.
Bug: 34893894
Test: mmma hardware/interfaces

Change-Id: Ic72716577a5f93700c5056986aff55a76b170b5d
2017-02-07 19:13:28 -08:00
Nick Desaulniers
20105c8b71 Fingerprint VTS
Bug: 34179855
Test:
  make vts;
  adb push
    out/host/linux-x86/vts/android-vts/testcases/DATA/nativetest64/fingerprint_hidl_hal_test/fingerprint_hidl_hal_test
    /data/local/tmp/.;
  adb shell /data/local/tmp/fingerprint_hidl_hal_test;

Change-Id: If9174dc34d0802388a9af8cda88b28329248bc42
2017-02-07 12:21:38 -08:00
Zhuoyao Zhang
60a3eee183 Merge "Update Andriod.bp for hals." 2017-02-03 23:46:49 +00:00
Zhuoyao Zhang
e9b43bbe2d Update Andriod.bp for hals.
* Add driver/profiler build rule for all hals.

Test: mma
Change-Id: I98325f7af14fec7dd1bb64b1668de8c7c20ace92
2017-02-03 10:03:01 -08:00
Yifan Hong
2b60a7d5e1 nit fix: compiler warning for BiometricsFingerprint.cpp
Test: make -j64 compiles without warning
Change-Id: Ieb8e9cd081a4e0511031b7a01deb0f7368a9d70e
2017-01-31 14:51:37 -08:00
Jim Miller
7802f42124 Merge "clean up default fingerprint HIDL@2.1 implementation" 2017-01-26 05:38:44 +00:00
Jim Miller
5f26c1ace2 clean up default fingerprint HIDL@2.1 implementation
- remove Binder dependency by passing keystore token to onAuthenticated()
- move notify() to cpp file

Test: recovers from killing keystore, fingerprint unlocks device,
FingerprintDialog works with crypto objects.

Fixes bug 34264028

Change-Id: Ic0de31603f4bc4147d6faf014af89e787b1ef244
2017-01-25 15:09:37 -08:00
Ryan Campbell
6d7514a4ce Update fingerprint makefile.
Update fingerprint makefile with VTS support in HIDL.

Test: pass
Bug: 34518442
Change-Id: I4556b027f4217ef9748e07555705911c03e1cbbd
2017-01-25 04:03:56 +00:00
Janis Danisevskis
a47afa9439 Adjust for minor changes in the native keystore client interface
Test: boot and use fingerprint to get an auth token
Change-Id: Ib5089457f31d17b73842e5aa4c73e61b590e6fbd
2017-01-20 13:51:53 +00:00
Jim Miller
6bfee7ccb1 Merge "Fix fingerprint crypto operations." 2017-01-19 23:43:26 +00:00
Jim Miller
7f7eb474ce Fix fingerprint crypto operations.
This fixes a bug introduced in the HIDL port where fingerprint no
longer notifies keystore of authentications.

Test: keyguard, FingerprintDialog

Fixes bug 34200870

Change-Id: I5227a5f7feb9eee926ea1511001d0303c90dc594
2017-01-19 13:20:05 -08:00