Commit graph

166 commits

Author SHA1 Message Date
Brian Duddie
154b0883f9 contexthub: Handle service death
Register for notification of service death for callbacks registered with
the context hub HAL. Upon this notification, unregister the callback to
avoid crashing if an event occurs prior to the service coming back up.

Bug: 36202367
Test: adb shell stop, confirm death notification received via log;
  vts-tradefed run commandAndExit vts --module VtsHalContexthubV1_0Target
Change-Id: I3c25229806cb9f2a116007939c752841edbf0985
2017-06-05 14:16:22 -07:00
Steven Moreland
7708449766 Update makefiles. (2/2) am: 76cfb84140
am: f203167814

Change-Id: I1f13401266f3c2f78c627088b09c79cd7c8d0276
2017-05-22 17:29:04 +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
d09cf863da Update makefiles for c++-sources and c++-headers. (2/2) am: bc71124120
am: a32ebce372

Change-Id: Ic1dd8f98e72656bc12a6e5224e541f75afb79daa
2017-05-11 01:38:14 +00: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
Steven Moreland
9c7f45cb75 ContextHub: IWYU
android-base macros was being transitively included from MQDescriptor.h

Test: links
Bug: 37791060
Change-Id: I2433462aae3d68a0d90cd6817338ba70d343b833
(cherry picked from commit 56b4c24bb7)
2017-05-02 19:04:03 +00:00
Steven Moreland
2cd0d42d72 Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Change-Id: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
2017-05-02 10:17:28 -07:00
TreeHugger Robot
982f3b620b Merge changes from topic 'hidl-libbase-remove-depends'
* changes:
  Sensors: IWYU
  ContextHub: IWYU
2017-05-01 22:48:00 +00:00
Steven Moreland
56b4c24bb7 ContextHub: IWYU
android-base macros was being transitively included from MQDescriptor.h

Test: links
Bug: 37791060
Change-Id: I2433462aae3d68a0d90cd6817338ba70d343b833
2017-05-01 13:15:01 -07:00
Steven Moreland
d62849a56e ContextHub: Android.mk -> Android.bp
Test: link
Change-Id: Id6e63e49e95b2a3f859e293b8e18b06f76bc70e6
2017-05-01 13:10:53 -07:00
TreeHugger Robot
206e38a4e8 Merge "Remove dependency of libhardware_legacy from HAL services" into oc-dev 2017-04-18 00:26:33 +00:00
Hung-ying Tyan
4f1bbf7074 Remove dependency of libhardware_legacy from HAL services
It is not used by these services.

Bug: 33241851
Bug: 37305530
Test: built and tested on sailfish
Change-Id: I1f3f51981d7dfcf27e18d9495c747b7662867d31
2017-04-15 10:17:16 +08: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
Steven Moreland
4e7a307730 Fix transitive includes.
Files relying on transitive include of utils/Log.h (and things that it
includes) from MQDescriptor.h

Test: pass
Merged-In: Iff316b21bef556bb026378b7f89e97ded3febef4
Change-Id: Iff316b21bef556bb026378b7f89e97ded3febef4
2017-04-06 22:04:05 +00: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
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
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
Tri Vo
f869c0cec4 Use default argument to getService.
Bug: 35769988
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--primary-abi-only --skip-preconditions --module
VtsHalContextHubV1_0Target -l VERBOSE
Change-Id: I3919226a7f0c6f2c5475fcba15f026297f93dcc3
2017-03-06 17:02:33 -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
Yifan Hong
2a3312257a Merge "context_hub HAL uses "default" service name" 2017-02-23 02:34:32 +00:00
Tri Vo
d94a7d2df9 Remove .vts spec files
Test: mmma hardware/interfaces
Change-Id: Idae97ce60a6368cfa685ae6b2d71b9ad163e8605
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
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
Keun Soo Yim
7b9b6ca18f move VTS stub files and non-functional tests
Test: mma
Bug: 34976004
Change-Id: I20273bdc3a05e2986fcf921f65d2afd6d72781e4
2017-02-04 02:45:25 +00:00
Keun Soo Yim
09717ddeb5 context hub: update vts files and add driver/profiler genrules
Test: mma
Bug: 34466754
Change-Id: Ia13d899bfee03745c8091dd79139229bb17fb46e
2017-02-02 22:34:22 -08:00
Brian Duddie
cd3a43f51f contexthub: Add VTS target tests
Introduce target-side VTS tests covering the Context Hub HAL.

Bug: 32021659
Test: make vts -j42 && \
      vts-tradefed run commandAndExit vts --primary-abi-only \
        --skip-all-system-status-check \
	--module ContexthubHidlTargetTest
Change-Id: I387ad0cccbfa824d292e2364f175dcec21134be1
2017-01-24 19:45:52 -08:00
Chris Phoenix
8f9c6cd6ef context_hub HAL 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: builds

Bug: 33844934
Change-Id: I5640441f5cfc7846e854f7ea23abb76ab3628d52
2017-01-23 17:50:47 -08:00
Brian Duddie
c6d2fd4953 contexthub: Explicitly pass nanoapp binary header data
Parse the nanoapp binary header in the framework and pass the relevant
data to the HAL explicitly in the NanoAppBinary structure. Note that not
all fields from the header are carried forward into NanoAppBinary, as
they are either implied by the HAL API (version, magic), or inherent in
the implementation-specific data (hwHubType), or unused and will only be
added via a future HAL version bump (second reserved field).

Also, convert the flags field in struct MemRange to a bitmask, which is
the proper representation for its use.

Bug: 34182159
Test: run hello world context hub GTS test
Change-Id: I13da9883b851e978d760548ec4265094ce81510a
2017-01-17 16:27:44 -08:00
Brian Duddie
9e8ffba9e3 Merge "contexthub: Expose CHRE version information" 2017-01-13 21:41:52 +00:00
Ashutosh Joshi
a8105da355 Merge "Add a callback to signal nanoApp abort." 2017-01-12 23:48:04 +00:00
Ashutosh Joshi
9dc48d4fba Add an identifier for the contexthub service endpoint.
Add a parameter that identifies the endpoint for the context hub service
end point. This represents a client at the Android API interface.

Test: Update makefiles.
Change-Id: Ib63c7b71dd70803c87f544643cf6a6f2666c7a31
2017-01-12 19:15:35 +00:00
TreeHugger Robot
2cfe8fcb2b Merge "liblog: use log/log.h when utilizing ALOG macros" 2017-01-12 18:58:25 +00:00
Ashutosh Joshi
4c48e652f7 Merge "Add new CHRE sensor types." 2017-01-12 17:50:23 +00:00
Ashutosh Joshi
19345474eb Add new CHRE sensor types.
Add new CHRE sensor types:
      i) Stationay detect sensor.
     ii) Instant motion detect sensor.
    iii) Reserved space for WWAN sensor types

Test: Run update makefiles.
Change-Id: I1e96b8614f88653d918d8cfa5fa86170e1a5dac3
2017-01-11 17:01:45 -08:00
Brian Duddie
188552e83f contexthub: Expose CHRE version information
Add chrePlatformId and chreVersion fields to context hub metadata
returned by getHubs(). This information will be used to make
compatibility decisions at runtime. Also, add a brief description of
CHRE to the IContexthub documentation to help clarify the
relationship between the HAL and these concepts in the CHRE API.

Bug: 31402693
Test: compile test only, this only adds fields to HIDL structures
Change-Id: Iea2436ccc23b47c4cf06040bebe1c550fe58ccb7
2017-01-12 00:03:23 +00:00
Mark Salyzyn
3ff5260601 liblog: use log/log.h when utilizing ALOG macros
Test: compile
Bug: 30465923
Change-Id: I67046a75be057e7905570748a1ed6bfd03c0e1c8
2017-01-11 15:47:40 -08:00
TreeHugger Robot
a8d358fb63 Merge changes from topic 'bphwfoo'
* changes:
  Bp/nFoo -> Bp/nHwFoo.
  Bp/nFoo -> Bp/nHwFoo
2017-01-11 23:43:16 +00:00
Ashutosh Joshi
8b26825308 Add a callback to signal nanoApp abort.
Adding a callback to indicate that a nanoApp has aborted.

Test: ran update-makefiles.
Change-Id: I4fdaf312c40e0e44f9e6326f37104c02da356999
2017-01-11 15:17:18 -08:00
Yifan Hong
a18049ad13 Bp/nFoo -> Bp/nHwFoo.
Test: mma
Bug: 33554989
Change-Id: I4b3f852d20fdfc49f2da671dd3c12d618ffb4140
2017-01-11 13:14:59 -08:00
Ashutosh Joshi
0d0b6833f6 Merge "Remove context hub reboot method." 2017-01-11 18:08:37 +00:00
Brian Duddie
c21ff099ec contexthub: Clarify nanoapp persistence
Add documentation to loadNanoApp() detailing the expected behavior
surrounding persistence of nanoapps across context hub reboots.

Test: none, documentation change only
Change-Id: I17db7d024cf7486749aff3816cc58b50f2f44fac
2017-01-11 01:02:49 +00:00
Ashutosh Joshi
1abbee3fd7 Remove context hub reboot method.
Remove context hub reboot method.
This was an unutilized method in the HAL definition.

Test: update makefiles.
Change-Id: I5d14966d6105b406e7177019e18ec06de0e04f53
2017-01-09 23:33:03 -08:00
Brian Duddie
730c95b6ae contexthub: Expose nanoapp enabled/disabled state
Add a flag to HubAppInfo that identifies whether an app is enabled and
running, or loaded but disabled. Also, make comments for structure
fields consistently start with a capital letter, and do some minor
comment cleanup.

Test: compile test only, adding a new field to an existing structure
Change-Id: Ia033afd3903d24e45235c70da21681669a53f4bf
2017-01-09 12:12:44 -08:00
Ashutosh Joshi
ff40e1f5e8 Merge "Modify ContextHubHAL" 2016-12-20 06:55:08 +00:00
Ashutosh Joshi
1bec86a185 Contexthub HAL default implementation and service.
Adds the default context hub hal implementation and service.

Test: Context Hub GTS tests still pass.
Change-Id: I7416ce9ec8efca7f98d2bb63606f030f4e8c8ead
2016-12-19 21:22:27 -08:00
Ashutosh Joshi
69e3aa3b1f Modify ContextHubHAL
Change the loadNanoApp signature to take the nanoapp binary as a vector.
Add some clarifications about timing.
Remove redundant parameter hubId from callbacks.

Test: update_makefiles.sh
Change-Id: I48cc0ba0001ac80329ac83148ebefdaa7deaa8bf
2016-12-19 16:52:48 -08:00
Yifan Hong
f35ee3b192 Revert "Revert "Update makefiles for Java package path.""
This reverts commit a8789f27cb.

Change-Id: I69980b580a556188ba868bb096ae1590b01759f5
2016-12-13 22:20:16 +00:00
Yifan Hong
a8789f27cb Revert "Update makefiles for Java package path."
This reverts commit ab0792ccdc.

Change-Id: I47fc272d9fa8875e3d7ccb10cb748c738fbf8135
2016-12-13 22:18:34 +00:00
Yifan Hong
ab0792ccdc Update makefiles for Java package path.
use V1_0 instead of 1.0.

Bug: 33554192

Test: hidl_test_java
Change-Id: Ic2d95265df10914a60a5bb743d75e839948838c3
2016-12-13 11:32:56 -08:00
Yifan Hong
501839495f Update makefiles for hidlizing IBase.
A new dependency android.hidl.base@1.0 is added for
all projects.

Test: mma

Change-Id: Ia70d0eb0d74de06475a339698386d383d491a43a
2016-12-03 01:01:14 -08:00
Steven Moreland
d26dc50abb Always specify underlying enum type.
Bug: 33197891
Test: compiles
Change-Id: I3d4822ea9a665708302d3bd1460425fddf1dcda9
2016-11-29 14:22:10 -08:00
Steven Moreland
f8d68ec855 Update makefiles for logging.
Bug: 32943424
Test: pass
Change-Id: Ic88ce6adf04e0e36db53e4cc06ac2ec5a90c011c
2016-11-21 16:28:54 -08:00
Yifan Hong
6b920e43d3 Split libhidl into base and transport.
Bug: 32756130

Test: mma
Change-Id: Id21cf23abe2910f26bb7895511862443b93dc112
2016-11-18 00:00:54 -08:00
Ashutosh Joshi
6104b27d6a Initial commit for the HIDL Context Hub HAL
Initial commit for the context hub Hal. At this point it is
largely a refactoring of the older HAL with some new abstractions.

Test: Make completes successfully
Change-Id: Ieac4b20403e6e0b3966a4f5570fbbba7151e783b
2016-11-14 16:19:38 -08:00