Commit graph

111 commits

Author SHA1 Message Date
TreeHugger Robot
1195320158 Merge "vehicle: respect result of registerAsService" 2017-04-27 02:59:01 +00:00
Steven Moreland
e50f2efab5 vehicle: respect result of registerAsService
Test: works with https://android-review.googlesource.com/c/358172/
Change-Id: I73bb43f0759f4e396ededf4d8ef7f13711c13276
2017-04-26 11:43:25 -07:00
Enrico Granata
c8ed5eb615 Merge "Don't set hidl_string's buffer to nullptr" 2017-04-26 17:21:15 +00:00
Asaf Rosenfeld
fd2259e756 Merge "split availability command into request and response" 2017-04-26 00:33:00 +00:00
Enrico Granata
01f5121a33 Don't set hidl_string's buffer to nullptr
Sending a null hidl_string from native code to Java is currently not
a supported operation and will cause a crash. As originally written,
shallowCopy would set a hidl_string to null as soon as a non-empty
stringValue was followed by an empty stringValue. Since freeze frames
come with a string value (the DTC) and live frames doesn't, this would
cause all diagnostics to crash while reading VehiclePropValue from parcel
immediately after dispatching a freeze frame. Fix by resetting empty strings
to a global non-null but zero length buffer.

Bug: 37435530
Test: diagnostic_injector.py
Change-Id: Ie79174dd7ab3d266f1e3addefa5ba9e2128ea9f8
2017-04-25 14:20:33 -07:00
Asaf Rosenfeld
5d9b428ff8 split availability command into request and response
Test: verified all VMS tests
Bug: b/37074894
Change-Id: Ia4beb5a08982990b14ee71920714e0808c2bffa3
2017-04-25 11:26:33 -07:00
Chris Forbes
88e89ef467 Merge changes from topic 'o-usage64-2' into oc-dev am: 441c1cb7d7
am: d350340340

Change-Id: I68fb3ba765ce0d55231e149a8b6a51fd42a19088
2017-04-25 04:27:24 +00:00
TreeHugger Robot
441c1cb7d7 Merge changes from topic 'o-usage64-2' into oc-dev
* changes:
  automotive: Adjust tests for libui gralloc flags change
  camera: Adjust for libui gralloc flags change
2017-04-25 04:12:31 +00:00
Pavel Maltsev
a4e82724da Merge "Fix failing VTS test cases" into oc-dev am: d77a4a5585
am: 0dbe46536b

Change-Id: I55813abb627487337b17c7e90e734687812f0485
2017-04-24 22:52:27 +00:00
Chris Forbes
f90642b8f8 automotive: Adjust tests for libui gralloc flags change
Change-Id: Ia88d8fc664196eae7153ccfb755ea9c3d135fd0c
Bug: b/33350696
Test: Bullhead: booted to launcher, take photo, watch youtube
2017-04-21 18:33:41 +00:00
Pavel Maltsev
0e251c8805 Fix failing VTS test cases
Also, increase number of binder threads in VHAL for performance testing

Fix: b/37543801, b/36778517
Bug: b/36510399

Test: make vts BUILD_GOOGLE_VTS=true -j32 && vts-tradefed run commandAndExit vts --skip-all-system-status-check --primary-abi-only --skip-preconditions --module VtsHalAutomotiveVehicleV2_0Host -l INFO && adb shell /data/nativetest64/android.hardware.automotive.vehicle@2.0-manager-unit-tests/android.hardware.automotive.vehicle@2.0-manager-unit-tests
Change-Id: I850c6be328f1a07ae3fda898a18137c76afe3115
2017-04-21 09:49:16 -07:00
TreeHugger Robot
0bb2fc80d7 Merge "Set the property ID before writing freeze frames" 2017-04-19 19:24:15 +00:00
Pavel Maltsev
decc02b6f5 Merge "Use IBinder to identify callbacks in VHAL" into oc-dev am: 2e25e562fa
am: 84163bc36f

Change-Id: Ifa921d812d63f2833e015201e8a1d111383b10ef
2017-04-18 23:51:44 +00:00
TreeHugger Robot
2e25e562fa Merge "Use IBinder to identify callbacks in VHAL" into oc-dev 2017-04-18 23:23:10 +00:00
Pavel Maltsev
41a000da58 Use IBinder to identify callbacks in VHAL
Right now there's no way to distinguish multiple clients, thus we cannot
associate IVehicleCallback from subscribe and unsubscribe method. As a
temporary solution we will use pointer to IBinder from underlying proxy
object until HILD will have some API to do that.

Test: verified unit tests run, checked that subsequent 'subscribe' calls
do not create new client objects in VHAL

Bug: b/37254245
Change-Id: I029564b7b03e4821287c2110d0929a5c4cbce0ce
2017-04-18 14:20:11 -07:00
Pavel Maltsev
753f3b0d1e Merge "Adding a custom property to the default VHAL impl" into oc-dev am: 69c42429d1
am: 7bac03deb2

Change-Id: I1ece0ab7a50274e4957155e01d4db50b9b52e645
2017-04-17 21:23:51 +00:00
TreeHugger Robot
69c42429d1 Merge "Adding a custom property to the default VHAL impl" into oc-dev 2017-04-17 20:57:38 +00:00
Pavel Maltsev
794fc4f9ff Adding a custom property to the default VHAL impl
This property is supposed to be used mostly from e2e tests (a simple
test-case is provided in separate CL)

Test: make -j && runtest -x packages/services/Car/tests/vehiclehal_test/

Bug: b/36510399
Change-Id: I09b24f22ab328eee1ef6add60901ed03bf046874
2017-04-17 10:39:27 -07:00
Enrico Granata
0d77167f5c Set the property ID before writing freeze frames
This fixes an issue where the default freeze frame data was not seen
by the diagnostic manager as it was never correctly stored in the database.

Test: manual in KitchenSink
Bug: 37327195
Change-Id: Ice33d8571daa52ae758ff2ac9926b6ea0b3a495c
2017-04-14 00:54:28 +00: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
Andreas Huber
e6e54801c1 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: I8b91881dfaf507c0d852d56ebbb53ff0987e5a34
2017-04-13 14:28:05 -07:00
Steven Moreland
d5bf55bd5a Merge changes from topic 'hidl-vendor-available' into oc-dev am: 17f0c0dde7
am: fce6b7f0d9

Change-Id: Ic95bee140e0bbbf094e89dcc7d0d99c30966786c
2017-04-12 22:54:17 +00:00
Antonio Cortes Perez
6ec2f58fa9 Merge "Adding VMS subscription HAL definitions." 2017-04-11 18:10:18 +00:00
Steven Moreland
3b36a83a2e Update makefiles (2/2).
Test: pass
Change-Id: Ic7e6289c7b69785491708ce0acbb657f4c704229
2017-04-11 09:58:03 -07:00
Chia-I Wu
4e91f7f17a Merge "graphics: revise gralloc interfaces" into oc-dev am: 586fd648d5
am: 51db3bcee4

Change-Id: I42e9059f793ff8fc5de84e534d108af6072e09ce
2017-04-11 01:29:37 +00:00
Chia-I Wu
79d13ff0f5 graphics: revise gralloc interfaces
Revise IAllocator and IMapper to reduce IPC and to support gralloc0
devices.

Specifically, IAllocator is trimmed down to have essentially only

    allocate(BufferDescriptor descriptor, uint32_t count)
        generates (Error error,
                   uint32_t stride,
                   vec<handle> buffers);

The ability to allocate buffers with shared backing store is
removed.  ProducerUsage and ConsumerUsage are moved to the
graphics.common package and are merged and renamed to BufferUsage.
BufferUsage's bits follow gralloc0.

IMapper gains

    typedef vec<uint32_t> BufferDescriptor;
    createDescriptor(BufferDescriptorInfo descriptorInfo)
          generates (Error error,
                     BufferDescriptor descriptor);

where BufferDescriptor is an implementation-defined blob.  lockFlex
is replaced by lockYCbCr.  All getters are removed.

Reference counting with retain/release is replaced by
importBuffer/freeBuffer.

Most if not all gralloc1 features are not used by the runtime yet.
There is also not too much test written for them.  As such, they
tend to behave differently between implementations and cannot be
used reliably.

Bug: 36481301
Test: builds and boots on Pixel
Change-Id: I1d31105120517ea2c128c7a19297acf3bfd312bb
2017-04-10 11:15:54 -07:00
Antonio Cortes
978cc33b06 Adding VMS subscription HAL definitions.
Test: build
Bug: 36137379
Change-Id: Id10fe1660d2165a677b4ce9dc7cc8a19c4e958c0
2017-04-10 09:41:36 -07:00
TreeHugger Robot
04b10ccc41 Merge "Fix transitive includes." 2017-04-06 23:36:13 +00: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
Steven Moreland
3eb7df74b8 Fix transitive includes.
Files relying on transitive include of utils/Log.h (and things that it
includes) from MQDescriptor.h

Test: pass
Change-Id: Iff316b21bef556bb026378b7f89e97ded3febef4
2017-04-06 15:01:59 -07:00
Scott Randolph
796507cf83 Merge "Use explicit .c_str() for hidl_string" into oc-dev am: f059ae420d
am: 0070a334b0

Change-Id: I13e2e0d1ad1fd596bb5ebf6694816b41332840d8
2017-04-06 20:09:56 +00:00
Scott Randolph
f059ae420d Merge "Use explicit .c_str() for hidl_string" into oc-dev 2017-04-06 18:01:48 +00:00
Pavel Maltsev
eef66f11b8 resolve merge conflicts of 3e942409 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia4867c10c2b28298fc493020e2dc44e885837dcc
2017-04-06 09:06:49 -07:00
Pavel Maltsev
33676528f8 Extract logic of storing values to separate class
Also rename DefaultVehicleHal to EmulatedVehicleHal and
extract emulator related code to VehicleEmulator class

Test: mm -j32 ; verified Car Service worked

Change-Id: I34361fdec6f94629cf7ef6c35ff56ef9ce78b855
2017-04-06 05:07:44 +00:00
Enrico Granata
5ecfdeacd9 Fix an issue where Vehicle HAL would crash when trying to update a continuous property without an initial floating-point value
Bug: 36858992
Test: build, flash and boot

(cherry picked from commit 945d0bbc86)

Merged-In: I9906abbf386cf75e838102299e3e97de3475db63
Change-Id: I19ef534fde190a3a1adaca377e8f09760c0ccf4e
2017-04-06 05:06:43 +00:00
Pavel Maltsev
8166677c4b Refactor default values in VHAL
Move default values closer to config declration to add properties
with less pain in future.

Test: mm -j32; verified if Car Service works

(cherry picked from commit 24ade17518)
Merged-In: I2f18837658149eb657f44d81e34eb8e6e497a25c
Change-Id: Ie4285581fa9d871b366b0ed2f08fa8073739a0a9
2017-04-06 05:01:49 +00:00
Asaf Rosenfeld
45dcdc4000 Merge "Adding availability HAL support" 2017-04-06 02:55:19 +00:00
Asaf Rosenfeld
5847a00f25 Adding availability HAL support
Test: as part of a seperate CL that uses this enum

Change-Id: Ibd9664547c2281b61e4b74c4cd30ffef457865a8
2017-04-05 14:10:43 -07:00
Scott Randolph
8997880087 Use explicit .c_str() for hidl_string
hidl_string no longer will provide an implicit cast to const char* as it
interfers with other expected behaviors of the class.  It now emulated
std::string in requiring a call to .c_str() to get the same behavior.

Bug:  36532780
Test:  Build the tree
Change-Id: I265590c7c18f425e44863df062a56b67519a932a
2017-04-04 10:53:26 -07:00
Pavel Maltsev
270aeae9f4 Remove dependency to libbinder in VHAL
Also, removed per property ACL as it was based on client UID

Test: mm -j ; verified Car Service works

Bug: b/36649684
Change-Id: I7625a013dda8e3ebce5b86a253a8c1befe267c11
(cherry picked from commit 72aebeb3ec)
2017-04-03 23:02:22 +00:00
Enrico Granata
945d0bbc86 Fix an issue where Vehicle HAL would crash when trying to update a continuous property without an initial floating-point value
Bug: 36858992
Test: build, flash and boot
Change-Id: I9906abbf386cf75e838102299e3e97de3475db63
2017-04-03 12:59:00 -07:00
Scott Randolph
827168cd0a Merge "Add VTS tests for EVS HAL" into oc-dev am: 35145b31bd
am: a307799ada

Change-Id: I6aa7246708407290eda6888597150c4c04744fc0
2017-04-01 01:01:13 +00:00
TreeHugger Robot
90defcf6bf Merge "Refactor default values in VHAL" 2017-03-31 23:33:29 +00:00
Scott Randolph
6c0855895a Add VTS tests for EVS HAL
Note:  This change list was developed as ag/2031642 on master, but
cherry picks are broken at the moment, so reapplying directly to oc-dev.
The change in master will be abandoned in favor of the auto-merger.

Test:  Run them against the default (mock) driver on bat_land
Change-Id: I7ae523eb6a18ce6a1d0dcd8494f335ffa77f34f1
2017-03-31 16:26:16 -07:00
TreeHugger Robot
a5ecf4604a Merge "Remove dependency to libbinder in VHAL" 2017-03-31 22:27:55 +00:00
Scott Randolph
ead77b1c85 Merge "Simplify EVS HAL and move to "agressive opens"" into oc-dev am: 9ee6abd72c
am: d72f9aede5

Change-Id: I63173b44b78378b194dd30b3117fe3036aca11d6
2017-03-31 00:40:05 +00:00
Scott Randolph
de9880eece Simplify EVS HAL and move to "agressive opens"
This adapts the API implementation to allow a duplicate "open" operation
to automatically close any previous connections to the device.  This
works around a binder level issue that can cause destructors triggered
by remote clients to be delivered out of order to the server.

This was originally change ag/1969959 on master, but has been
recreated on oc-dev (cherry-picking was broken at the time).
The original master change will be abandoned in favor of this getting
merged down from oc-dev.

Test:  Run Vts test (added in following change)
Change-Id: I7b417998e59a4d592fbb91811c4101f39097c5dd
2017-03-30 14:04:12 -07:00
Pavel Maltsev
24ade17518 Refactor default values in VHAL
Move default values closer to config declration to add properties
with less pain in future.

Test: mm -j32; verified if Car Service works
Change-Id: I2f18837658149eb657f44d81e34eb8e6e497a25c
2017-03-30 11:25:36 -07:00
bohu
48e4002b2e Revert "Revert "Fix build after ag/2001747 breakage.""
This reverts commit 430d0510e6.

Test: I build full-eng successfully

Change-Id: I77166a8a36e893be476a1067356124914a607c39
2017-03-29 19:39:41 +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