Commit Graph

4031 Commits

Author SHA1 Message Date
Jeff Tinker
52ea2d0772 Merge "DRM vts test bug fixes" into oc-dev
am: ca7205fa61

Change-Id: I873889b274818b27064f32467828ac18c14c9c92
2017-04-13 18:08:32 +00:00
TreeHugger Robot
ca7205fa61 Merge "DRM vts test bug fixes" into oc-dev 2017-04-13 17:53:05 +00:00
Jeff Tinker
9dee7287e8 DRM vts test bug fixes
A session wasn't being closed in the ListenerKeysChange
test, that was causing erratic behavior on subsequent tests.
The expected return code was incorrect in the test
AttemptDecryptWithKeysRemoved.

bug:37272108
Change-Id: I11590b85c81548622359d91ebc9af75276a7b58c
2017-04-13 00:56:34 -07:00
Michael Butler
662493ced3 Merge "Connecting to BufferQueue before setting surface." into oc-dev
am: e7375c079d

Change-Id: Ice04dac674346bcfbdadae8b3a70431c8290b8db
2017-04-13 04:58:40 +00:00
TreeHugger Robot
e7375c079d Merge "Connecting to BufferQueue before setting surface." into oc-dev 2017-04-13 04:49:58 +00:00
Steven Moreland
eb3b525e46 Merge "libhwcomposer-client: mark as vendor_available" into oc-dev
am: cb1d509d21

Change-Id: I4a151c03680131fe9b7142995fae2c194ac47e73
2017-04-13 04:24:50 +00:00
Steven Moreland
726213e55e Merge "Mark as vendor_available" into oc-dev
am: b5213bb7f9

Change-Id: I6de8ea7c4dcebca83e78db6cbc3e2c051a312cb8
2017-04-13 04:24:39 +00:00
Steven Moreland
b55798272c Merge "android.hardware.camera.common@1.0-helper: vendor" into oc-dev
am: f8b85e63e4

Change-Id: Iaa3a3346ad1650cf89db0aa89249319f2f5cbf52
2017-04-13 04:24:28 +00:00
TreeHugger Robot
cb1d509d21 Merge "libhwcomposer-client: mark as vendor_available" into oc-dev 2017-04-13 04:12:19 +00:00
TreeHugger Robot
b5213bb7f9 Merge "Mark as vendor_available" into oc-dev 2017-04-13 04:12:15 +00:00
TreeHugger Robot
f8b85e63e4 Merge "android.hardware.camera.common@1.0-helper: vendor" into oc-dev 2017-04-13 04:12:12 +00:00
Iliyan Malchev
0852506624 Merge changes from topic 'libACRONYM' into oc-dev
am: 9eece058d6

Change-Id: I6d1ee4108b0bed906ff71f29f6519dbf9da6e775
2017-04-13 04:00:56 +00:00
Iliyan Malchev
63c2f84aaf android.hardware.camera.provider@2.4: set up /dev/vndbinder
am: b4488af17c

Change-Id: Id1900eb23ca664dabbff08c8af34f2aed2013eef
2017-04-13 04:00:53 +00:00
TreeHugger Robot
9eece058d6 Merge changes from topic 'libACRONYM' into oc-dev
* changes:
  composer: route binder traffic over vndbinder
  android.hardware.camera.provider@2.4: set up /dev/vndbinder
2017-04-13 03:55:29 +00:00
Steven Moreland
a6c48341d1 Merge "bluetooth: include what you use" into oc-dev
am: 86bf840964

Change-Id: Icb5c9beb6e1f04e9f2b0d012f7a449aed4100023
2017-04-13 03:50:17 +00:00
TreeHugger Robot
86bf840964 Merge "bluetooth: include what you use" into oc-dev 2017-04-13 03:35:45 +00:00
Jeff Tinker
94c3beecfc Merge "Change drm/crypto service names to "default"" into oc-dev
am: 8eb3a1ea59

Change-Id: I942fa45af11ff966c41fd61482dde34e5828cc36
2017-04-13 02:34:20 +00:00
TreeHugger Robot
8eb3a1ea59 Merge "Change drm/crypto service names to "default"" into oc-dev 2017-04-13 02:25:25 +00:00
Michael Butler
06a7d395b8 Connecting to BufferQueue before setting surface.
Bug: 37172220

Test: mma, runs on sailfish
Change-Id: I2ed8e55ed9e6149245ca0d605441eff74eac45e2
2017-04-12 19:05:20 -07:00
Steven Moreland
8f7229efd7 Mark as vendor_available
By setting vendor_available, the following may become true:

* a prebuilt library from this release may be used at runtime by
  in a later releasse (by vendor code compiled against this release).
  so this library shouldn't depend on runtime state that may change
  in the future.
* this library may be loaded twice into a single process (potentially
  an old version and a newer version). The symbols will be isolated
  using linker namespaces, but this may break assumptions about 1
  library in 1 process (your singletons will run twice).

Background:

This means that these modules may be built and installed twice --
once for the system partition and once for the vendor partition. The
system version will build just like today, and will be used by the
framework components on /system. The vendor version will build
against a reduced set of exports and libraries -- similar to, but
separate from, the NDK. This means that all your dependencies must
also mark vendor_available.

At runtime, /system binaries will load libraries from /system/lib*,
while /vendor binaries will load libraries from /vendor/lib*. There
are some exceptions in both directions -- bionic(libc,etc) and liblog
are always loaded from /system. And SP-HALs (OpenGL, etc) may load
/vendor code into /system processes, but the dependencies of those
libraries will load from /vendor until it reaches a library that's
always on /system. In the SP-HAL case, if both framework and vendor
libraries depend on a library of the same name, both versions will be
loaded, but they will be isolated from each other.

It's possible to compile differently -- reducing your source files,
exporting different include directories, etc. For details see:

https://android-review.googlesource.com/368372

None of this is enabled unless the device opts into the system/vendor
split with BOARD_VNDK_VERSION := current.

Bug: 36426473
Bug: 36079834
Test: m -j android.hardware.sensors@1.0-convert
Test: attempt to compile with BOARD_VNDK_VERSION := current
Change-Id: I0a4e8a658b5b33bd7a6668242f98a4f6cda2a94f
2017-04-13 01:37:56 +00:00
Iliyan Malchev
77d1987496 Merge "configstore: add startGraphicsAllocatorService" into oc-dev
am: 1f8c6639e6

Change-Id: I546bb9dd04acc5daf64eaf92e6f7de2c87356aba
2017-04-13 00:57:09 +00:00
Iliyan Malchev
1f8c6639e6 Merge "configstore: add startGraphicsAllocatorService" into oc-dev 2017-04-13 00:42:13 +00:00
Iliyan Malchev
f140afe383 composer: route binder traffic over vndbinder
b/36683636 Hwcomposer is starting binder threads

Test: sailfish

Change-Id: I28ad19b5036c6fbf514770369888ca11892bf212
Signed-off-by: Iliyan Malchev <malchev@google.com>
2017-04-13 00:25:08 +00:00
Iliyan Malchev
b4488af17c android.hardware.camera.provider@2.4: set up /dev/vndbinder
The camera-HAL implementation may need to communicate with other vendor
components over /dev/vndbinder.  Route all libbinder traffic to that
node.

b/36651814
b/36651237
b/35870313
b/36683636

Test: sailfish

Change-Id: I9b80fefbcdf5ce18a2d788e8582ea8791a604435
Signed-off-by: Iliyan Malchev <malchev@google.com>
2017-04-13 00:24:39 +00:00
Steven Moreland
6b71a79306 Merge "Mark hidl test libs as vendor." am: 12d911204f am: 8b6bd56d18
am: 1d3fc97e0f  -s ours

Change-Id: I974f6221833d3157d6357115274852c6874f2d3d
2017-04-12 23:30:07 +00:00
Steven Moreland
1d3fc97e0f Merge "Mark hidl test libs as vendor." am: 12d911204f
am: 8b6bd56d18

Change-Id: If61451e2bec7a5494658dda326e336e285ac7832
2017-04-12 23:24:17 +00:00
Steven Moreland
8b6bd56d18 Merge "Mark hidl test libs as vendor."
am: 12d911204f

Change-Id: Id44396d47c7bc625906edfabff2fbdc7082dad8a
2017-04-12 23:18:17 +00:00
Treehugger Robot
12d911204f Merge "Mark hidl test libs as vendor." 2017-04-12 23:07:17 +00:00
Steven Moreland
fce6b7f0d9 Merge changes from topic 'hidl-vendor-available' into oc-dev
am: 17f0c0dde7

Change-Id: I277bade95b1ed2c46e982f3c03145121a0248080
2017-04-12 22:22:07 +00:00
Amit Mahajan
3223d0ea38 Merge "Add p2 option in OpenLogicalChannel" into oc-dev
am: ddeb776201  -s ours

Change-Id: Ia0a3a2afe643713dd9f6307532a1fda4d9fab46b
2017-04-12 22:21:51 +00:00
Steven Moreland
17f0c0dde7 Merge changes from topic 'hidl-vendor-available' into oc-dev
* changes:
  Update makefiles (2/2).
  Update makefiles.
2017-04-12 22:13:58 +00:00
Wileen Chiu
1ec7f971e1 Add p2 option in OpenLogicalChannel
am: d87bd02d5a  -s ours

Change-Id: If4c8f514a6ebf36b1d5858fb2bde5e0bb330c247
2017-04-12 22:13:57 +00:00
Amit Mahajan
ddeb776201 Merge "Add p2 option in OpenLogicalChannel" into oc-dev 2017-04-12 22:02:40 +00:00
Brian C. Anderson
782dd1f541 Merge "Add PRESENT_FENCE_IS_NOT_RELIABLE" into oc-dev
am: 21c2e11345

Change-Id: I8697cdc90dc46cbd0d0771314d7f603c3c9837b5
2017-04-12 21:40:07 +00:00
Brian C. Anderson
21c2e11345 Merge "Add PRESENT_FENCE_IS_NOT_RELIABLE" into oc-dev 2017-04-12 21:26:24 +00:00
Steven Moreland
d52e0ff21a Mark hidl test libs as vendor.
They must be on the vendor partition for hidl_test to be able to link to
them when the VNDK is in place.

Test: hidl_test
Bug: 33241851
(cherry picked from commit 00556e0a11)
Merged-In: I23c9e0674aaf33602bc9fde0515eb2f87ce5c60c
Change-Id: I23c9e0674aaf33602bc9fde0515eb2f87ce5c60c
2017-04-12 13:58:10 -07:00
Steven Moreland
af0a987434 Merge "Mark hidl test libs as vendor." into oc-dev
am: 32f726a62d

Change-Id: I96f582f0d3d1926ed5238785e414edc6f68b2b23
2017-04-12 20:15:58 +00:00
Steven Moreland
215e45769a Merge "libgrallocmapperincludes: as header lib and vendor" into oc-dev
am: 0b3004f38f

Change-Id: I8ab1e6ca321c8545866156c33febb924f63fc0b9
2017-04-12 20:15:48 +00:00
TreeHugger Robot
32f726a62d Merge "Mark hidl test libs as vendor." into oc-dev 2017-04-12 20:07:48 +00:00
Steven Moreland
9f9f1ad71e Merge "bluetooth: include what you use" am: 2e7ce4d73f am: cbd97452d3
am: c2aca5dba7

Change-Id: I0113701089d21145e93bdeeba708c3fab12bfdbf
2017-04-12 20:06:40 +00:00
TreeHugger Robot
0b3004f38f Merge "libgrallocmapperincludes: as header lib and vendor" into oc-dev 2017-04-12 20:04:25 +00:00
Steven Moreland
c2aca5dba7 Merge "bluetooth: include what you use" am: 2e7ce4d73f
am: cbd97452d3

Change-Id: I2c210fdbd21580c231c439be6b0c223fb0d799e5
2017-04-12 19:59:31 +00:00
Steven Moreland
cbd97452d3 Merge "bluetooth: include what you use"
am: 2e7ce4d73f

Change-Id: I6ad653360422fa3aa2f39719ad3ddfe03b2cc640
2017-04-12 19:54:01 +00:00
Treehugger Robot
2e7ce4d73f Merge "bluetooth: include what you use" 2017-04-12 19:41:26 +00:00
Lajos Molnar
b959f22a08 Merge "Add IOmxStore and remove IOmxNode::setQuirks." into oc-dev
am: 5af63734be

Change-Id: I381afa75e69d47b774ac3e02c66a03b18e733568
2017-04-12 19:01:20 +00:00
Ningyuan Wang
2cb8be5b54 Merge "Add more VTS tests for ISupplicantP2pIface" into oc-dev
am: 2d76d8670a

Change-Id: I2b846253ef012589b32895921cd09e19692e3f8c
2017-04-12 19:01:04 +00:00
TreeHugger Robot
5af63734be Merge "Add IOmxStore and remove IOmxNode::setQuirks." into oc-dev 2017-04-12 18:55:09 +00:00
TreeHugger Robot
2d76d8670a Merge "Add more VTS tests for ISupplicantP2pIface" into oc-dev 2017-04-12 18:52:18 +00:00
Brian Anderson
9af5d942a6 Add PRESENT_FENCE_IS_NOT_RELIABLE
Test: adb shell /data/nativetest/libgui_test/libgui_test
  --gtest_filter=*GetFrameTimestamps*
Bug: 36730849, 36887025

Change-Id: Ide992e4dda7840f7982237943256ea3019eda434
2017-04-12 11:28:55 -07:00
Connor O'Brien
346120e6a5 Merge "Fix failure to load power HAL implementation" into oc-dev
am: ad504560cc

Change-Id: I87310cd0239c1d343734861d3783710299d3775d
2017-04-12 18:10:23 +00:00