OSDN Git Service
Steven Moreland [Fri, 14 Apr 2017 18:03:15 +0000 (18:03 +0000)]
Merge "libbinder: vendor_available" into oc-dev
am:
80a50bdc3b
Change-Id: If99137a1ea7e4214b1ba705a38b894692e2778fc
Vijay Venkatraman [Fri, 14 Apr 2017 18:03:03 +0000 (18:03 +0000)]
Merge "Move include/binder to libs/binder/include" into oc-dev
am:
9451d0b8ce
Change-Id: I7384f2b19143e30ca524549fcd81b95a5aaa7beb
TreeHugger Robot [Fri, 14 Apr 2017 17:57:40 +0000 (17:57 +0000)]
Merge "libbinder: vendor_available" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 17:57:36 +0000 (17:57 +0000)]
Merge "Move include/binder to libs/binder/include" into oc-dev
Hendrik Wagenaar [Fri, 14 Apr 2017 17:43:56 +0000 (17:43 +0000)]
Merge "Update optics" into oc-dev
am:
0a9e585fe2
Change-Id: I95636e962b9994bac5486f1b4f4706405e08ed79
TreeHugger Robot [Fri, 14 Apr 2017 17:31:15 +0000 (17:31 +0000)]
Merge "Update optics" into oc-dev
Iliyan Malchev [Fri, 14 Apr 2017 15:15:58 +0000 (15:15 +0000)]
Merge "binder: allow repeated invocations of initWithDriver" into oc-dev
am:
11c1acc33a
Change-Id: I44a4f3cb656c12eba9f506a5cb1299ca3faa985c
Iliyan Malchev [Fri, 14 Apr 2017 15:08:32 +0000 (15:08 +0000)]
Merge "binder: allow repeated invocations of initWithDriver" into oc-dev
Iliyan Malchev [Fri, 14 Apr 2017 07:34:57 +0000 (00:34 -0700)]
binder: allow repeated invocations of initWithDriver
As long as the driver name is the same, calls to
ProcessState::initWithDriver() will succeed, returning the
already-created object.
Test: marlin
Change-Id: I87d5ca2a105becd8d4fa6fa85c00b879360229b3
Signed-off-by: Iliyan Malchev <malchev@google.com>
PO HUNG CHEN [Fri, 14 Apr 2017 06:53:28 +0000 (06:53 +0000)]
Merge "Refine the binder latency test" into oc-dev
am:
f18f8fe8cb
Change-Id: I0bc0cac5fd11bb197addc382699b57d0b17d22b6
PO HUNG CHEN [Fri, 14 Apr 2017 06:42:50 +0000 (06:42 +0000)]
Merge "Refine the binder latency test" into oc-dev
Mathias Agopian [Fri, 14 Apr 2017 06:13:45 +0000 (06:13 +0000)]
get rid of IGraphicBufferAlloc
am:
0556d79eac
Change-Id: I9b76eac770fc7585ea73a8497ae04e22ad5b9eec
Mathias Agopian [Wed, 22 Mar 2017 22:49:32 +0000 (15:49 -0700)]
get rid of IGraphicBufferAlloc
Buffers can now be allocated directly through
the graphic allocator HAL.
Test: marlin: run full camera cts
Test: angler: take screenshot, take photo w/ and w/o HDR, video, panorama, refocus, slo-mo
Bug:
36462585
Bug:
36333314
Change-Id: Ie5222c53c3b9462e0ac7a41568718aad131eb328
Steven Moreland [Fri, 14 Apr 2017 04:19:48 +0000 (21:19 -0700)]
libbinder: 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 libbinder
Test: attempt to compile with BOARD_VNDK_VERSION := current
Change-Id: Iec94a66adbc852f7f23352307cf36f49a79ee3a6
Hendrik Wagenaar [Tue, 4 Apr 2017 21:38:36 +0000 (14:38 -0700)]
Update optics
* Specify optics via system properties
Bug:
36039976
Test: Ran on device
Change-Id: I7a38e5a9eb3b8a861f1997d5011ec109f5e79cca
Howard Chen [Mon, 10 Apr 2017 10:51:20 +0000 (18:51 +0800)]
Refine the binder latency test
* limit the output line length be be under 80.
* fix the target service when pair > 2
Bug:
36705188
Test: sailfish with prebuilt kernel on oc-dev
Change-Id: I5ce2754418a669a61f9913a30dbeb7176796e230
Vijay Venkatraman [Fri, 24 Mar 2017 23:13:58 +0000 (16:13 -0700)]
Move include/binder to libs/binder/include
Also moved include/private/binder to libs/binder/include/private/binder.
This allows libbinder to be compiled without depending on global
headers.
Bug:
33241851
Test: Build, flash, and run sailfish.
Test: Try building with BOARD_VNDK_VERSION := current
Change-Id: I0a82b733353add589de26eb2db7af5a246e5c97f
Yifan Hong [Fri, 14 Apr 2017 00:20:58 +0000 (00:20 +0000)]
Merge "Update to allow multiple HALs in a manifest." into oc-dev
am:
1011062e1a
Change-Id: I3ed6dfa6daa5750a1c5262431fb876fa5203a824
Michael Spang [Fri, 14 Apr 2017 00:12:09 +0000 (00:12 +0000)]
Merge "Import broadcast_ring.h from GVR (reland)" into oc-dev
am:
afe7df1a3f
Change-Id: I6b136b5d754a7fda78140137db1c282495179d58
TreeHugger Robot [Fri, 14 Apr 2017 00:11:05 +0000 (00:11 +0000)]
Merge "Update to allow multiple HALs in a manifest." into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 00:07:42 +0000 (00:07 +0000)]
Merge "Import broadcast_ring.h from GVR (reland)" into oc-dev
Alex Vakulenko [Thu, 13 Apr 2017 22:30:25 +0000 (22:30 +0000)]
Merge "libpdx_uds: Handle EACCES error when connecting to PDX service" into oc-dev
am:
4df4202551
Change-Id: I02d1f307717c1628f6a6d54130d0bd5a2551bf84
TreeHugger Robot [Thu, 13 Apr 2017 22:21:03 +0000 (22:21 +0000)]
Merge "libpdx_uds: Handle EACCES error when connecting to PDX service" into oc-dev
Craig Donner [Thu, 13 Apr 2017 21:28:12 +0000 (21:28 +0000)]
Merge "Use a separate heap size to receive buffer" into oc-dev
am:
ca0b8ccfc5
Change-Id: I7d4b6c6f6103d19d0ae12b9850eca33d4d956411
TreeHugger Robot [Thu, 13 Apr 2017 21:18:49 +0000 (21:18 +0000)]
Merge "Use a separate heap size to receive buffer" into oc-dev
Tomasz Wasilczyk [Thu, 13 Apr 2017 21:15:20 +0000 (21:15 +0000)]
Merge "Revert "Avoid a potential race condition on mDisplays"" into oc-dev
am:
c90e469393
Change-Id: I12fa7cabdc29dcc707756c8e849682b93ceee199
TreeHugger Robot [Thu, 13 Apr 2017 21:07:43 +0000 (21:07 +0000)]
Merge "Revert "Avoid a potential race condition on mDisplays"" into oc-dev
Dan Stoza [Thu, 13 Apr 2017 20:44:49 +0000 (20:44 +0000)]
Merge changes Ica5f5f5c,Ifb7d2cec,Ia402b4bc,I9c3b6b7e,I36ba19c7, ... into oc-dev
am:
1b47dfd749
Change-Id: I9617b0192d649ac63bc7f1d587590000bae3cf86
TreeHugger Robot [Thu, 13 Apr 2017 20:30:48 +0000 (20:30 +0000)]
Merge changes Ica5f5f5c,Ifb7d2cec,Ia402b4bc,I9c3b6b7e,I36ba19c7, ... into oc-dev
* changes:
libgui: Make IGraphicBufferConsumer a SafeInterface
libbinder: Add vector<Parcelable> to SafeInterface
libbinder: Add sp<NativeHandle> to SafeInterface
libbinder: Support enums in SafeInterface
libbinder: Support sp<Flattenable> in SafeInterface
libbinder: Add int64_t/uint64_t to SafeInterface
libgui: Normalize IGraphicBufferConsumer methods
libgui: Format IGraphicBufferConsumer
Tomasz Wasilczyk [Thu, 13 Apr 2017 19:14:30 +0000 (19:14 +0000)]
Revert "Avoid a potential race condition on mDisplays"
This reverts commit
8d6c16dc3dc8b88a0046f53668a4e3be074507ff.
Bug: b/
37282502
Change-Id: Ibf64607f9e14ede201510e2c1b502c49a31e9f2a
Svetoslav Ganov [Thu, 13 Apr 2017 19:02:11 +0000 (19:02 +0000)]
Merge "Add autofill feature API" into oc-dev
am:
3a717993fa
Change-Id: I0bcd259aa5a3f688d29689585a3b5f60d5e0e7f8
Svetoslav Ganov [Thu, 13 Apr 2017 18:54:01 +0000 (18:54 +0000)]
Merge "Add autofill feature API" into oc-dev
Svet Ganov [Thu, 13 Apr 2017 18:51:44 +0000 (11:51 -0700)]
Add autofill feature API
bug:
35956220
Test: manual (requires a custom build)
Change-Id: I5d42919d9419ac34825709cd80affa705cce32ed
Calin Juravle [Thu, 13 Apr 2017 17:45:38 +0000 (17:45 +0000)]
Merge "Fix installd test" into oc-dev
am:
22651020b5
Change-Id: I6ce8ae2c3550786fe876ce59beb5f29214b05bba
Corey Tabaka [Thu, 13 Apr 2017 17:45:21 +0000 (17:45 +0000)]
Merge "libvrhwc: Fix dependency order because Soong." into oc-dev
am:
aaa1e1621e
Change-Id: If2d518091fe2e6b25bd7ae3f673890f942370b40
Michael Spang [Sat, 8 Apr 2017 00:22:17 +0000 (20:22 -0400)]
Import broadcast_ring.h from GVR (reland)
This will be used as a transport by the pose plumbing.
Remove host_supported=true from the blueprint. Although this library is
portable C++11, some of the tests aren't, and I don't know how to test
the various SDK targets in order to properly #ifdef them.
Bug:
37102512
Test: m -j32 broadcast_ring_tests; broadcast_ring_tests
Change-Id: Ib91387f2feba9030d2e892dc5145e353b88bad45
Craig Donner [Thu, 13 Apr 2017 01:38:07 +0000 (18:38 -0700)]
Use a separate heap size to receive buffer
Bug:
37216168
Bug:
37245884
Test: cts-tradefed run cts -m CtsNativeHardwareTestCases -t AHardwareBufferTest#AHardwareBuffer_SendAndRecv_Succeeds
Change-Id: I3bdf9c6a24ee1b07a14499f0987b0ac028bbae09
Martijn Coenen [Thu, 13 Apr 2017 17:12:25 +0000 (17:12 +0000)]
Merge "Add android.hardware.nfc.any to NFC features." into oc-dev
am:
e7def4e9e0
Change-Id: I4c40be1c19abbac0c0a3808126821ee35b0bf307
Alex Vakulenko [Wed, 12 Apr 2017 21:02:19 +0000 (14:02 -0700)]
libpdx_uds: Handle EACCES error when connecting to PDX service
There is a race condition in the way init process creates socket
files before it forks into a child (see system/core/init/util.cpp,
function create_socket()). It first creates a socket, then calls
bind() which creates a file entry, then calls chown/chmod to change
ownership and access permissions of that file object. If a client
process connects to the socket just after bind() was called but before
chmod(), the socket file will have incorrect permissions and the
connect call will be aborted with EACCESS (Permission denied) error.
We should retry connection in case we get EACCESS. A proper fix would
be is to find a way for init to create the file entry with the proper
permissions to start with, and eliminate the race condition altogether.
Bug:
37171113
Test: `lunch sailfish-eng && m -j32` succeeds
Device boots correctly.
Error recovery is handled correctly even after adding sleep(5)
to init process just before calling chmod on the socket.
Change-Id: If97c316daa0c0be5ff7b5aa302a69aa60e9fb237
Calin Juravle [Thu, 13 Apr 2017 16:55:50 +0000 (16:55 +0000)]
Merge "Fix installd test" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 16:54:16 +0000 (16:54 +0000)]
Merge "libvrhwc: Fix dependency order because Soong." into oc-dev
Martijn Coenen [Thu, 13 Apr 2017 16:53:18 +0000 (16:53 +0000)]
Merge "Add android.hardware.nfc.any to NFC features." into oc-dev
Daniel Nicoara [Thu, 13 Apr 2017 16:48:29 +0000 (16:48 +0000)]
Merge "Cleanup VR HWC type names in libdvr" into oc-dev
am:
dc87165eb5
Change-Id: I1829d325df18c783b8ac7c7871c9bb68f4cfbed4
TreeHugger Robot [Thu, 13 Apr 2017 16:35:03 +0000 (16:35 +0000)]
Merge "Cleanup VR HWC type names in libdvr" into oc-dev
Ian Elliott [Thu, 13 Apr 2017 14:21:51 +0000 (14:21 +0000)]
Merge "Only enumerate display_timing when present timestamp supported" into oc-dev
am:
430f8eae67
Change-Id: I97f8e31b73d5428b7b70409702286bb292ff9657
Ian Elliott [Thu, 13 Apr 2017 14:08:45 +0000 (14:08 +0000)]
Merge "Only enumerate display_timing when present timestamp supported" into oc-dev
Tony Mak [Thu, 13 Apr 2017 12:04:10 +0000 (12:04 +0000)]
Merge "Revert "Import broadcast_ring.h from GVR"" into oc-dev
am:
5bf90e1d47
Change-Id: I57c43fbeb716cb788bc098a2ff1a58aba426c773
TreeHugger Robot [Thu, 13 Apr 2017 11:54:37 +0000 (11:54 +0000)]
Merge "Revert "Import broadcast_ring.h from GVR"" into oc-dev
Tony Mak [Thu, 13 Apr 2017 09:39:04 +0000 (09:39 +0000)]
Revert "Import broadcast_ring.h from GVR"
This reverts commit
e5c34974f2dd8a8e9ec61e68799d55f6df343224.
Reason for revert: Failing SDK target, see
https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=sdk_phone_armv7-sdk_mac&lkgb=
3906845&fkbb=
3908362
Seems fix should be something like this:
https://android-review.googlesource.com/#/c/316195/1/src/code-buffer-vixl.cc
Anyway, I am not native code expert, so going to revert this :)
Test: treehugger only
Change-Id: Iba00bec4c2c8667dffd96f90a57948c827c4a6a3
Peng Xu [Thu, 13 Apr 2017 08:32:43 +0000 (08:32 +0000)]
Merge "Remove UID requirement for set sched_fifo for sensor thread" into oc-dev
am:
62dd04b4f2
Change-Id: Iff60e27ad92631e130795b3fe1fb820af9e41046
Corey Tabaka [Thu, 13 Apr 2017 08:24:56 +0000 (01:24 -0700)]
libvrhwc: Fix dependency order because Soong.
Static library dependencies must (usually) be in reverse order of
dependency. Use the correct dependency order to fix the build.
Bug: None
Test: make -j30
Change-Id: I332c800d993561ade3afb3c5eadeee73f97fb475
TreeHugger Robot [Thu, 13 Apr 2017 08:25:33 +0000 (08:25 +0000)]
Merge "Remove UID requirement for set sched_fifo for sensor thread" into oc-dev
Yifan Hong [Thu, 13 Apr 2017 08:00:12 +0000 (01:00 -0700)]
Update to allow multiple HALs in a manifest.
Test: libvintf_test
Test: lshal --init_vintf
Bug:
37294247
Change-Id: I202787d7856db6e06e595bd52c644f6a0eefcb66
Robert Carr [Thu, 13 Apr 2017 07:22:12 +0000 (07:22 +0000)]
Merge "SurfaceFlinger: Add parent-less relative layering." into oc-dev
am:
7dcda8011d
Change-Id: Ib6cd65edeeb2d1cbd577d8dade2d02ba0b25b4bd
TreeHugger Robot [Thu, 13 Apr 2017 07:12:51 +0000 (07:12 +0000)]
Merge "SurfaceFlinger: Add parent-less relative layering." into oc-dev
Chong Zhang [Thu, 13 Apr 2017 06:34:41 +0000 (06:34 +0000)]
Merge "MediaCas: combine openSession methods" into oc-dev
am:
a30e1cbfcc
Change-Id: I90d7496fc25ff3b2bd98883253cec44d9e5779bb
TreeHugger Robot [Thu, 13 Apr 2017 06:23:45 +0000 (06:23 +0000)]
Merge "MediaCas: combine openSession methods" into oc-dev
Steven Moreland [Thu, 13 Apr 2017 04:24:09 +0000 (04:24 +0000)]
Merge "libhwc2on1adapter: mark as vendor_available" into oc-dev
am:
4a5c8a3c97
Change-Id: I0d1274767fe70358302f7a6a76aa6306eb04743c
TreeHugger Robot [Thu, 13 Apr 2017 04:12:33 +0000 (04:12 +0000)]
Merge "libhwc2on1adapter: mark as vendor_available" into oc-dev
Michael Spang [Thu, 13 Apr 2017 03:14:04 +0000 (03:14 +0000)]
Merge "Import broadcast_ring.h from GVR" into oc-dev
am:
bb724dd447
Change-Id: I59aa0537268e76b9b15ee22108619b2e94211dd8
TreeHugger Robot [Thu, 13 Apr 2017 03:07:15 +0000 (03:07 +0000)]
Merge "Import broadcast_ring.h from GVR" into oc-dev
Peng Xu [Tue, 11 Apr 2017 05:16:48 +0000 (22:16 -0700)]
Remove UID requirement for set sched_fifo for sensor thread
Allow all requests to set priority.
Test: check error message in log, check thread prio using systrace
Bug:
35219747
Change-Id: I2b43c172ec0c982cb829764f484a057d096d82bc
Calin Juravle [Thu, 13 Apr 2017 01:20:44 +0000 (18:20 -0700)]
Fix installd test
CreatePrimaryCurrentProfile was using the wrong userid for the expected
value.
Test: adb shell /data/nativetest/installd_utils_test/installd_utils_test
Bug:
36101738
Change-Id: I80b8212d09a0e4b600c00f85ac604a0e5fa1cc11
Frank Barchard [Thu, 13 Apr 2017 01:12:55 +0000 (01:12 +0000)]
Merge "display_manager_client unused parameter warning fixes" into oc-dev
am:
4267ac38bd
Change-Id: Iee5a1e21ddd2bdf2f083c53134de8e55d9afcfa5
TreeHugger Robot [Thu, 13 Apr 2017 01:06:30 +0000 (01:06 +0000)]
Merge "display_manager_client unused parameter warning fixes" into oc-dev
Iliyan Malchev [Thu, 13 Apr 2017 00:57:06 +0000 (00:57 +0000)]
Merge "surfaceflinger: start grahpics allocator when requested" into oc-dev
am:
7da46d06f0
Change-Id: If687b478f82fd24d7fbfab430a51c217ba8f05a4
Iliyan Malchev [Thu, 13 Apr 2017 00:42:12 +0000 (00:42 +0000)]
Merge "surfaceflinger: start grahpics allocator when requested" into oc-dev
Yifan Hong [Thu, 13 Apr 2017 00:13:32 +0000 (00:13 +0000)]
Merge "Add PERMISSION_DENIED to convertResult." into oc-dev
am:
d111a91cd1
Change-Id: I1860fc445ffe3bffd41162043dc99f5eafb5eda6
Yifan Hong [Wed, 12 Apr 2017 23:53:00 +0000 (23:53 +0000)]
Merge "Add PERMISSION_DENIED to convertResult." into oc-dev
Dan Stoza [Mon, 10 Apr 2017 20:41:53 +0000 (13:41 -0700)]
libgui: Make IGraphicBufferConsumer a SafeInterface
Converts IGraphicBufferConsumer to be a SafeInterface such that all
parceling/unparceling is done automatically.
Test: libgui_tests + manual testing
Change-Id: Ica5f5f5c3e6b5735f0f1327a50cefe8f3f6f0feb
Dan Stoza [Mon, 10 Apr 2017 20:28:54 +0000 (13:28 -0700)]
libbinder: Add vector<Parcelable> to SafeInterface
Adds support fo sending and receiving std::vector<Parcelable>
parameters (such as the vector of OccupancyTracker::Segments in
IGraphicBufferConsumer::getOccupancyHistory) as part of a SafeInterface.
Test: New test in binderSafeInterfaceTest
Change-Id: Ifb7d2cece79ee9fd52791f61d2488e6a490805f3
Dan Stoza [Fri, 7 Apr 2017 23:32:38 +0000 (16:32 -0700)]
libbinder: Add sp<NativeHandle> to SafeInterface
Adds support for sending and receiving sp<NativeHandle> parameters as
part of a SafeInterface.
Test: New test in binderSafeInterfaceTest
Change-Id: Ia402b4bceedff358864669d201b4c1e22be6d0fa
Steven Moreland [Wed, 12 Apr 2017 23:18:48 +0000 (23:18 +0000)]
Merge "Mark as vendor_available" into oc-dev
am:
b120f2ead6
Change-Id: I21a67fee1ddb79fa2f1d5845d40a2a2cb04e73b7
Steven Moreland [Wed, 12 Apr 2017 23:10:18 +0000 (23:10 +0000)]
Merge "Mark as vendor_available" into oc-dev
Frank Barchard [Wed, 12 Apr 2017 23:04:42 +0000 (16:04 -0700)]
display_manager_client unused parameter warning fixes
Bug:
37206802
Test: builds locally with no warnings
Change-Id: I5755ee30d6ce4057297c367222d3cdd44904e23e
Edit
Peng Xu [Wed, 12 Apr 2017 22:28:14 +0000 (22:28 +0000)]
Merge "Correct configure direct report function document" into oc-dev
am:
e502a9b2e2
Change-Id: Id1c535e5271da42656b6cce5ba6e4b64f906b07f
Ian Elliott [Mon, 10 Apr 2017 20:42:30 +0000 (14:42 -0600)]
Only enumerate display_timing when present timestamp supported
Test: CTS and cube demo.
Bug:
36887025
Vulkan should only enumerate the VK_GOOGLE_display_timing extension if
the device supports reliably returning the present timestamp. Vulkan
will determine this by reading a property that SurfaceFlinger will set
(based on the HWC2::Capability::PresentFenceIsNotReliable capability).
Change-Id: I6025be5f9120a8f02f228b8437b64be4ff8cfb17
TreeHugger Robot [Wed, 12 Apr 2017 22:08:34 +0000 (22:08 +0000)]
Merge "Correct configure direct report function document" into oc-dev
Brian C. Anderson [Wed, 12 Apr 2017 21:40:03 +0000 (21:40 +0000)]
Merge changes from topic 'presentFenceNotReliable' into oc-dev
am:
21d072ac4a
Change-Id: If70925313d46370103d1aa09a38348fb5731bee0
Martijn Coenen [Wed, 12 Apr 2017 21:39:48 +0000 (21:39 +0000)]
Merge "Link vndservicemanager against libselinux statically." into oc-dev
am:
94f2ea67c5
Change-Id: I824ad4f11704c5bf95f12e7b0ffeaa9ddc23f78d
Brian C. Anderson [Wed, 12 Apr 2017 21:26:22 +0000 (21:26 +0000)]
Merge changes from topic 'presentFenceNotReliable' into oc-dev
* changes:
egl: Use reserved values for eglGetFrameTimestamps
egl: Differentiate pending vs invalid timestamps.
egl: Avoid use of retire as present
TreeHugger Robot [Wed, 12 Apr 2017 21:11:42 +0000 (21:11 +0000)]
Merge "Link vndservicemanager against libselinux statically." into oc-dev
Martijn Coenen [Wed, 12 Apr 2017 20:49:52 +0000 (13:49 -0700)]
Add android.hardware.nfc.any to NFC features.
So we can start the NFC process whenever one of
these is present.
Bug:
36873979
Bug:
37269025
Test: NFC is still started on devices with this feature
Change-Id: I879c084c1ed56e33a4249172c8fa3c04b1c5f236
Chia-I Wu [Thu, 30 Mar 2017 18:56:21 +0000 (11:56 -0700)]
surfaceflinger: start grahpics allocator when requested
When ISurfaceFlingerConfigs::startGraphicsAllocatorService returns
true, start graphics allocator service.
Bug:
36462585
Test: YouTube, Play Movies
Change-Id: Iac177e96ec89465398ec3eef46208bdb817934e3
Josh Gao [Wed, 12 Apr 2017 20:02:31 +0000 (20:02 +0000)]
Merge "atrace: don't use sendfile." am:
c1c9354ad8 am:
86504eb9e6
am:
3ec7db90cc
Change-Id: I4f57aaf2b483a98631bb746b77cecfacf52298b1
Josh Gao [Wed, 12 Apr 2017 19:54:03 +0000 (19:54 +0000)]
Merge "atrace: don't use sendfile." am:
c1c9354ad8
am:
86504eb9e6
Change-Id: I1cdcf014bc7d5b40d1ecd20649d6b2c63777aa7a
Josh Gao [Wed, 12 Apr 2017 19:49:03 +0000 (19:49 +0000)]
Merge "atrace: don't use sendfile."
am:
c1c9354ad8
Change-Id: Ic42793ae6df11ac557e21cbd7a6d6bf758e2c3d8
Robert Carr [Mon, 10 Apr 2017 23:55:57 +0000 (16:55 -0700)]
SurfaceFlinger: Add parent-less relative layering.
This is a temporary functionality for the intermediate state where not
all child-surface like things in WM land are ported to use Child
Surfaces. In particular, we have ported SurfaceView to use child
surfaces and relative Z ordering. However the TV frameworks provide a
View framework component which overlays views over the SurfaceView but
below the main application window. Since we have not ported View
framework surfaces to use child layers, there is nothing the WM or
View Framework can do about this situation. Luckily the WM API's to
have requested this are @hide but we have the one media framework
component using it. In order to solve this issue we provide a method
to set Z ordering relative to another window without inheriting
its coordinate space as a child window would. This way the WM can
recognize these TYPE_APPLICATION_MEDIA_OVERLAY windows and Z-order
them at -1 with respect to the parents (and the SurfaceView can be at
-2).
Test: Included in transaction tests. Also manual test of bug repro steps with accomp frameworks/base CL
Bug:
36693738
Change-Id: I921852d3d34f67f79ec745b9703f9e679867e7a1
Dan Willemsen [Wed, 12 Apr 2017 19:46:02 +0000 (19:46 +0000)]
Merge "Mark as vendor_available" am:
d03d569f06 am:
b365ddfbf5
am:
1bc920ae16
Change-Id: I83a4e64b7237316b4aa8c4c68336fe246538e6e2
Josh Gao [Wed, 12 Apr 2017 19:43:13 +0000 (19:43 +0000)]
Merge "atrace: don't use sendfile."
Dan Willemsen [Wed, 12 Apr 2017 19:37:31 +0000 (19:37 +0000)]
Merge "Mark as vendor_available" am:
d03d569f06
am:
b365ddfbf5
Change-Id: I52bf41fd520c08904c24ec63353f57e30b2eafe3
Dan Willemsen [Wed, 12 Apr 2017 19:32:31 +0000 (19:32 +0000)]
Merge "Mark as vendor_available"
am:
d03d569f06
Change-Id: I685b097e616aa605eaacc917d1de75e45555fc52
Treehugger Robot [Wed, 12 Apr 2017 19:21:34 +0000 (19:21 +0000)]
Merge "Mark as vendor_available"
Martijn Coenen [Wed, 12 Apr 2017 18:50:42 +0000 (11:50 -0700)]
Link vndservicemanager against libselinux statically.
Bug:
37189668
Test: vndservicemanager works
Change-Id: I8187fb86371d5a2073287beb6b17e263eedfb17b
Daniel Nicoara [Thu, 6 Apr 2017 18:29:40 +0000 (14:29 -0400)]
Cleanup VR HWC type names in libdvr
Add DvrHwc prefix to enums and types defined in the API to avoid naming
conflicts.
Bug:
36050795
Test: Compiled
Change-Id: Ic5071ccd6f2b16863f0001009a4255f8279ce1e8
Dianne Hackborn [Wed, 12 Apr 2017 18:03:58 +0000 (18:03 +0000)]
Merge "Add private helpers needed for job queue." into oc-dev
am:
68a2340243
Change-Id: I2cc3f89d6b8034d8cbebde8fdd42a9b94a33f0da
Dianne Hackborn [Wed, 12 Apr 2017 17:55:49 +0000 (17:55 +0000)]
Merge "Add private helpers needed for job queue." into oc-dev
Andreas Gampe [Wed, 12 Apr 2017 17:32:41 +0000 (17:32 +0000)]
Merge "Otapreopt: Check dexopt return status before retry" into oc-dev
am:
d3ef230cac
Change-Id: I581bf4250a6ed5f86b2f1c6c417cb6c337fda7c6
TreeHugger Robot [Wed, 12 Apr 2017 17:19:19 +0000 (17:19 +0000)]
Merge "Otapreopt: Check dexopt return status before retry" into oc-dev
Chris Forbes [Wed, 12 Apr 2017 08:11:17 +0000 (08:11 +0000)]
Merge changes Ia1fa4a32,I2a4c3d9f into oc-dev
am:
6d957ec373
Change-Id: I70a0a4b117013f5dbca339729be4799b49c135a1