OSDN Git Service
TreeHugger Robot [Sat, 1 Apr 2017 22:15:50 +0000 (22:15 +0000)]
Merge "[libadapter] Fix nullpointer in acceptchanges" into oc-dev
Fabien Sanglard [Thu, 30 Mar 2017 23:27:02 +0000 (16:27 -0700)]
[libadapter] Fix nullpointer in acceptchanges
Check the layer still exists upon accepting changes.
Bug:
36205238
Test: AUPT
Change-Id: I8443265ecc7b8b0a12347439fd75b138d14c7e3a
Yin-Chia Yeh [Thu, 30 Mar 2017 20:13:36 +0000 (13:13 -0700)]
DO NOT MERGE: ConsumerBase: call freeBufferLocked when a slot is overwritten
Cherrypicked from master.
Test: the CL + camera service side fix pass ReprocessCaptureTest
Bug:
34461678
Change-Id: Ia7863321bcb46cba53532fc1570c5facd9280aaa
TreeHugger Robot [Sat, 1 Apr 2017 06:08:37 +0000 (06:08 +0000)]
Merge "vulkan: Dequeue the shared buffer again after presenting" into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 05:46:12 +0000 (05:46 +0000)]
Merge "vulkan: Don't dequeue in AcquireNextImageKHR if in shared mode" into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 04:45:36 +0000 (04:45 +0000)]
Merge "Allow VirtualDisplay's to use hardware composer when in VR mode even if physical composer does not support them." into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 04:34:44 +0000 (04:34 +0000)]
Merge changes I9ad4588e,I83a676fc,I749242c4,Idc0d3c23 into oc-dev
* changes:
vulkan: Only cancel buffers during swapchain creation if not shared
vulkan: Set shared & auto refresh modes earlier
vulkan: Track whether in shared mode in Swapchain
vulkan: Always request at least 2 images for swapchain
TreeHugger Robot [Sat, 1 Apr 2017 01:01:37 +0000 (01:01 +0000)]
Merge "Add UID in bugreport" into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 22:51:45 +0000 (22:51 +0000)]
Merge "Add default .clang-format" into oc-dev
Alex Vakulenko [Fri, 31 Mar 2017 16:10:43 +0000 (09:10 -0700)]
bufferhubd: Fix an error on not closing post_fence explicitly.
There is a typo in the code that instead of calling close() on a Post
fence, actually did get_fd() which is really a no-op.
Fixed by changing the call to call() explicitly.
Bug: None
Test: `m -j32` succeeds. Sailfish boots, CubeSea works.
Change-Id: If788aa8ea291317f0618724ecc35a4b355575772
Alex Vakulenko [Fri, 31 Mar 2017 15:29:28 +0000 (08:29 -0700)]
libbufferhub: Fix compiler warning with printf format mismatch
std::vector<bool>::at() does not return bool& but a special reference
proxy class. Passing this class on the stack for "%d" printf specifier
is unsafe.
Compiler throws a warning to indicate this problem:
format specifies type 'int' but the argument has type 'reference'
(aka '__bit_reference<std::__1::vector<bool, std::__1::allocator<bool>>>')
Fixed by explicitly casting to int before pushing the value onto the stack.
Bug: None
Test: `m -j32` = no more warning
Change-Id: I7b3bc4908e4932c25be60fc350e0e0b439842b66
Alex Vakulenko [Fri, 24 Mar 2017 00:44:58 +0000 (17:44 -0700)]
libpdx_uds: Improve client connection logic
Handle the case where the service created a socket file but not bound the
socket to it, or not listening for incoming requests yet. Also, if the service
has crashed and left the socket file behind, need to make sure we reconnect
once the service is restarted.
Bug: None
Test: `m -j32` succeeds, device boots and CubeSea app works on Sailfish
Change-Id: I2039cfca6faccd5d1d4b725e454075669484b880
(cherry picked from commit
d074fc416a7a90e76a0b28a870080c1dd30079a1)
Alex Vakulenko [Thu, 23 Mar 2017 18:52:44 +0000 (11:52 -0700)]
Remove unused dependency on libhardware from bufferhubd
'libhardware' doesn't seem to be used anymore. Remove it.
Bug: None
Test: `m -j32` succeeds.
Change-Id: I2ff002ce17d920f44509347ca86ca5f030348cf5
(cherry picked from commit
f9f18b6b5c413ffeb8cc3ac67dd49bc17364a76f)
Alex Vakulenko [Thu, 30 Mar 2017 17:53:11 +0000 (10:53 -0700)]
libbufferhubqueue: Fix syntax in Android.bp
There was a spelling mistake for cflags property of libbufferhub
cc_library object.
Bug: None
Test: `m -j32` succeeds
Change-Id: I862c2266d86586469dc7299bf727f75bb3df6512
(cherry picked from commit
66fd7cb0f3b1a70121fb223b27a51f06534ebc46)
Dan Stoza [Fri, 24 Mar 2017 18:09:55 +0000 (11:09 -0700)]
Add default .clang-format
Adds a default .clang-format for frameworks/native. If this style is
undesirable for a given component in this repo, it can be overriden
with a more local .clang-format file.
Test: None necessary, only for formatting
Change-Id: I0bf6bd9a15255d9a4ce3d485e841912955caa310
(cherry picked from commit
ec106f6cc73e2cbe63ad6c8e942c11d764c8158c)
Alex Sakhartchouk [Sun, 26 Mar 2017 16:28:34 +0000 (12:28 -0400)]
Allow VirtualDisplay's to use hardware composer when in VR mode even if
physical composer does not support them.
Bug:
36071574
Test: Applied remaining wip patches, launched 2D activity while in
persistent VR mode. Observed 2D activity rendered in VR in VirtualDisplay.
Further, instrumented SurfaceFlinger code to ensure DisplayDevice's are
created and destroyed with proper composers during VR mode transition.
Change-Id: I12b09f1209fcf33f97abfd77e14c6ce61f45a5e9
(cherry picked from commit
d38ec4e294eadd4f655476fc90b675c78c1c8740)
Chris Forbes [Thu, 30 Mar 2017 06:48:39 +0000 (19:48 +1300)]
vulkan: Dequeue the shared buffer again after presenting
Ensures that the shared buffer is always dequeued. This is tidier than
the previous hacky approach of dequeueing it on demand just prior to
this.
Test: build
Change-Id: I0202271a12106470329180b51a2eea19ceab31af
Chris Forbes [Thu, 30 Mar 2017 06:47:37 +0000 (19:47 +1300)]
vulkan: Don't dequeue in AcquireNextImageKHR if in shared mode
We've already got the shared buffer dequeued. All we need to do here
is make the semaphore and fence work.
Test: build
Change-Id: I77a49c312e91b5e0657b87ac2748428c631bdbc0
Chris Forbes [Thu, 30 Mar 2017 06:44:15 +0000 (19:44 +1300)]
vulkan: Only cancel buffers during swapchain creation if not shared
When a buffer queue is in shared mode, we're not allowed to cancel
buffers. Just keep the shared buffer dequeued all the time.
Test: build
Change-Id: I9ad4588ebd792ccdfee247d030579e2ef68aaef1
Chris Forbes [Thu, 30 Mar 2017 06:37:50 +0000 (19:37 +1300)]
vulkan: Set shared & auto refresh modes earlier
We'd like to be able to remove the 2-buffer-minimum workaround -- but to
make that reasonable, we need the lower layers to know we're trying to
use shared mode. Set the appropriate modes before determining the buffer
counts, as a first step toward that.
Change-Id: I83a676fc1a86510abd4521cf9a5e80c0334d5941
Test: build
Chris Forbes [Thu, 30 Mar 2017 06:31:40 +0000 (19:31 +1300)]
vulkan: Track whether in shared mode in Swapchain
We need to adjust our behavior in various other places if this is the
case.
Test: build
Change-Id: I749242c4c7f0b19693b6cc5bfcf2dd6e01ed0e5b
Chris Forbes [Thu, 16 Mar 2017 22:28:32 +0000 (11:28 +1300)]
vulkan: Always request at least 2 images for swapchain
For shared mode, we really only care about 1 image, but there are other
changes further down the stack that need to be made for that to really
work. For now, just tell the bufferqueue that we want 2. After that, we
still only dequeue one buffer (as in fact required by BQ in shared mode)
and construct one VkImage over it for giving back to the vulkan app.
[in V1 we were just smashing the buffer count to 2, which is messier and
observable by the app]
Change-Id: Idc0d3c232d56a5c0127f9472611d151f3605939c
Test: build
TreeHugger Robot [Thu, 30 Mar 2017 21:58:58 +0000 (21:58 +0000)]
Merge "Add alpha channel for the EGLConfig" into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 20:57:56 +0000 (20:57 +0000)]
Merge "fix the api style" into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 20:22:29 +0000 (20:22 +0000)]
Merge "VR: Pass display size in the HWC observer callback" into oc-dev
neo.he [Tue, 21 Mar 2017 03:48:36 +0000 (11:48 +0800)]
Add alpha channel for the EGLConfig
If the alpha channel is not assigned,the framebuffer will be Opaque.
And it will mask the underlying video and make the video invisible
when play video width mediaplayer
cherry-picked from AOSP master
Issue: b/
36025630
Test: clean build and boot PixelC
Change-Id: If756ad2aaa789f6ddb178333b3e8854f52c8eac3
Hendrik Wagenaar [Thu, 30 Mar 2017 18:53:32 +0000 (11:53 -0700)]
fix the api style
google3 c++ style says "no _ on struct members"
Happy to oblige
Bug: None
Test: Compiled
Change-Id: I74b65908339551b703125fe16e5a6d11cd3e9a89
Robert Carr [Wed, 29 Mar 2017 19:10:31 +0000 (12:10 -0700)]
Fix seamless rotation with SurfaceView WM bypass.
First a brief review on seamless rotation. In seamless rotation
the WM will do the following atomically:
1. Update the display transform.
2. Set window transforms to make the surfaces at their old size appear
at the correct location in the new coordinate space.
3. Set a flag to undo the transforms when the surfaces resize.
However, windows with NATIVE_WINDOW_TRANSFORM_DISPLAY needed to be special cased.
The flag will perform step 2 in terms of buffer mapping, but not in terms of bounds
computation. So to compensate the WM would apply the transform to the bounds,
set these bounds, and then skip applying the transform matrix (as the buffer is
transformed by the flag).
Now that the WM can't see the Camera view, it can't implement this special logic
and the Camera view inherits the parent transform. We compensate for this in
SurfaceFlinger by omitting parent rotation transform components for
Surfaces with NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY. To some extent this
breaks arbitrary rotation for surfaces with NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY
but this is essentially ok:
1. We lived with that bug until N-MR1
2. We fixed it in N-MR1 because the camera was falling back to ROTATE
a lot which shouldn't be happening anymore, following introduction
of specifying rotation animation in manifest.
Test: Rotate camera, disable HWC, rotate camera some more. Switch to front camera, repeat.
Bug:
36230754
Bug:
36727915
Change-Id: Ied390c9cb3968fcce32a84ee7947f699746fdc81
Dan Stoza [Thu, 23 Mar 2017 21:41:55 +0000 (14:41 -0700)]
libgui: Make ISurfaceComposerClient a SafeInterface
Converts ISurfaceComposerClient (specifically its Bp/Bn children) to be
SafeInterfaces such that all parceling/unparceling is done
automatically.
Test: Manual testing
Change-Id: Ie5eee51fc893b0e4d7c3b498fe756306f9a029b5
Dan Stoza [Thu, 1 Dec 2016 23:16:31 +0000 (15:16 -0800)]
libbinder: Add SafeInterface
Adds SafeInterface, a mechanism which will automatically translate
IInterface method calls into remote procedure calls, avoiding the need
to manually write parceling and unparceling code for each method.
Test: binderSafeInterfaceTest
Change-Id: I0fc7a6eee5528371f40b90d056404cb024166b23
Daniel Nicoara [Tue, 28 Mar 2017 15:48:42 +0000 (11:48 -0400)]
VR: Pass display size in the HWC observer callback
1) Unify the places where primary display size is queried.
2) Allows virtual displays to have a different size than the primary
display and the size propagates properly to VR HWC and its observer.
Bug: None
Test: Unittest and manually on device
Change-Id: I7e026c4f9b018d47ca400247beed27841d71c806
(cherry picked from commit
04c73d23d5e366c9f0337cdaa71bd2d15ebf1f4e)
Tony Mak [Thu, 30 Mar 2017 16:47:09 +0000 (17:47 +0100)]
Add UID in bugreport
Test: adb bugreport, found uid in logcat.
Change-Id: I90ab10adb05fe835a6ce74bddb0f1b88aacd22a7
Fix:
36339235
TreeHugger Robot [Thu, 30 Mar 2017 01:57:31 +0000 (01:57 +0000)]
Merge "vndk/window.h must be C compatible" into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 01:02:13 +0000 (01:02 +0000)]
Merge "Add 180 rotation to sensord orientation" into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 00:24:40 +0000 (00:24 +0000)]
Merge "Add basic dvrSurface C API" into oc-dev
Mathias Agopian [Wed, 29 Mar 2017 23:06:48 +0000 (16:06 -0700)]
vndk/window.h must be C compatible
Test: added a c compatibility test
Bug:
36725813
Change-Id: Ic7e1c8b50e1818707a9a457d84ed74e7e6c816c8
Hendrik Wagenaar [Fri, 24 Mar 2017 20:51:17 +0000 (13:51 -0700)]
Add 180 rotation to sensord orientation
Bug: None
Test: Manually tested locally
Change-Id: I135416a2c5be68172ff466bad503261adf29c5a9
TreeHugger Robot [Wed, 29 Mar 2017 22:31:14 +0000 (22:31 +0000)]
Merge "vrwm: Fix controller input/rendering mismatch" into oc-dev
Jiwen 'Steve' Cai [Fri, 24 Mar 2017 01:53:16 +0000 (18:53 -0700)]
Add basic dvrSurface C API
Test: Build and flash system
Bug:
36563654
Change-Id: Id6c79d33d80e719b1d1d7f43aec99aadfad40c03
TreeHugger Robot [Wed, 29 Mar 2017 21:01:20 +0000 (21:01 +0000)]
Merge "Make sure dvr functions are prepended with dvr" into oc-dev
Albert Chaulk [Wed, 29 Mar 2017 15:27:58 +0000 (11:27 -0400)]
vrwm: Fix controller input/rendering mismatch
This works for portrait mode only for now. Landscape phones present
some weird buffer sizes (1080x1080) that get scaled incorrectly for
input
This also removes all of our older hacks, such as swapping
width/height in SurfaceFlingerView and the swap + invert of touch
input. A global 90 degree rotation is applied to present the portrait
buffers in the correct orientation
vr_wm_ctl has a command to stack another rotation on top of the
existing ones in order to facilitate development for now. Apps will
likely show up rotated, "vr_wm_ctl rotate 1" will fix it, or -1 if
it needs to be rotated the other way.
Bug: None
Test: Manual with permissions and calculator
Change-Id: Ifd31b444b944fbf3085613349caae37e817538f6
(cherry picked from commit
eb49c451cbc5de7bbe5ba440dc8e43291daa6d4e)
Kevin Schoedel [Wed, 29 Mar 2017 20:27:48 +0000 (20:27 +0000)]
Merge "Recenter upon notification from VrCore" into oc-dev
Hendrik Wagenaar [Wed, 29 Mar 2017 17:50:25 +0000 (10:50 -0700)]
Make sure dvr functions are prepended with dvr
* Fix some inconsistencies
Bug: None
Test: Compiled
Change-Id: I9d67d2335f543700bd1a90d329e4b155f4c22c69
Kevin Schoedel [Wed, 29 Mar 2017 17:45:59 +0000 (13:45 -0400)]
Recenter upon notification from VrCore
Bug:
36201389
Test: manual on device
Change-Id: I690b70130e45732f052d136bedd587ddbf9493b4
Jiwen Cai [Wed, 29 Mar 2017 17:35:11 +0000 (17:35 +0000)]
Merge "Return jobject when getting android Java Surface" into oc-dev
Ian Elliott [Tue, 28 Mar 2017 19:20:35 +0000 (13:20 -0600)]
Temporarily disable 2 unratified Khronos extensions.
Test: Ran the following CTS test cases, which now say "NotSupported":
dEQP-VK.wsi.android.surface.query_capabilities2
dEQP-VK.wsi.android.surface.query_formats2
dEQP-VK.wsi.android.shared_presentable_image.scale_none.demand
dEQP-VK.wsi.android.shared_presentable_image.scale_none.continuous
dEQP-VK.wsi.android.shared_presentable_image.scale_up.demand
dEQP-VK.wsi.android.shared_presentable_image.scale_up.continuous
dEQP-VK.wsi.android.shared_presentable_image.scale_down.demand
dEQP-VK.wsi.android.shared_presentable_image.scale_down.continuous
Disable the Khronos/Vulkan VK_KHR_get_surface_capabilities2 and
VK_KHR_shared_presentable_image extensions until the May 5th
ratification of these two extensions. A macro/ifdef's are used to allow
easy enablement of the extensions for internal testing and bug fixes.
V2: convert preprocessor flag to constant [chrisforbes]
Change-Id: Ic41360e42561a822d51e1d7fc3172c76c12e5bde
Jiwen 'Steve' Cai [Wed, 29 Mar 2017 02:15:34 +0000 (19:15 -0700)]
Return jobject when getting android Java Surface
This logic is originally borrowed from similar API from shim_gvr API
where we cannot explicity deps on JNI.h in the public header. This
constrain no longer exists as libdvr is an Android platform library.
Bug:
2013449
Test: Built libdvr
Change-Id: Ide72f5fb706cd24e13507749216d7708f1f40fcc
TreeHugger Robot [Wed, 29 Mar 2017 01:23:47 +0000 (01:23 +0000)]
Merge "Use lshal's new --debug option when emitting bugreports." into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 20:55:50 +0000 (20:55 +0000)]
Merge "Use gralloc usage conversion library" into oc-dev
Felipe Leme [Tue, 28 Mar 2017 18:54:20 +0000 (11:54 -0700)]
Temporarily skipping dump of bluetooth logs.
Bug:
35998031
Test: manual verification
Change-Id: I0bdf6eb1546c0850b301441f48753b65fa7b1e5e
Andreas Huber [Thu, 23 Mar 2017 16:47:51 +0000 (09:47 -0700)]
Use lshal's new --debug option when emitting bugreports.
This calls into live binderized services and logs their "IBase::debug(...)"
output.
Bug:
36520620
Test: make, adb shell lshal, adb shell bugreport
Change-Id: I421e30e74c82817adf276b5750ce40038852df83
Jesse Hall [Thu, 23 Mar 2017 18:03:23 +0000 (11:03 -0700)]
Use gralloc usage conversion library
Converting from ..graphics.allocator@2.0 usage to gralloc0 usage isn't
quite as simple as ORing and truncating, which is what the default
implementation was doing. Switch to using library functions that do it
correctly.
Test: boot bullhead
Change-Id: Ibe644b53655e191b9bca9d619825a8918e8fc365
TreeHugger Robot [Tue, 28 Mar 2017 05:41:04 +0000 (05:41 +0000)]
Merge "Remove legacy cache clearing logic."
TreeHugger Robot [Tue, 28 Mar 2017 02:39:12 +0000 (02:39 +0000)]
Merge "Add stub for SensorManager::createEventQueue"
Jaesoo Lee [Fri, 24 Mar 2017 04:52:12 +0000 (13:52 +0900)]
fixed bug undefining LIKELY/UNLIKELY in math lib
Bug:
36275627
Test: Built and check the surfaceflinger compiled
Change-Id: I062b8c0db540443635ac746824edb295190235d0
TreeHugger Robot [Mon, 27 Mar 2017 23:16:23 +0000 (23:16 +0000)]
Merge "Disable BufferQueueInAnotherProcess test"
Jeff Sharkey [Mon, 27 Mar 2017 22:41:06 +0000 (16:41 -0600)]
Remove legacy cache clearing logic.
It was riddled with funky memory access, and it's been fully replaced
by the new V2 logic.
Test: builds, boots
Bug:
27948817,
36655947
Change-Id: Ic5f0636c414ccf5ccf56eb50fea321b6688a83a0
Mathias Agopian [Mon, 27 Mar 2017 22:03:23 +0000 (22:03 +0000)]
Merge changes Iad7bf035,I870e08c6
* changes:
VNDK ANativeWindow API - step 2
VNDK ANativeWindow API
Kalle Raita [Mon, 27 Mar 2017 21:11:54 +0000 (14:11 -0700)]
Disable BufferQueueInAnotherProcess test
The BufferQueueInAnotherProcess relies on executing before any test that
tries to open a BufferQueue in the local process. A recent test addition
broke the condition. Upcoming SF & BQ changes are likely to obsolete the
test, so won't spend time on fixing it. Disabling for now and the test
will be removed when the infrastructure changes land.
Test: libgui_test
Bug:
36592665
Change-Id: I648e197cab6bab3aed445390069265589a717bf1
Andreas Huber [Mon, 27 Mar 2017 21:12:41 +0000 (21:12 +0000)]
Merge "Enable --debug option for "lshal" command." am:
16175ca725 am:
674d3acd18
am:
829f3c6d85
Change-Id: I6751fec855783983b96672bec82ae9ba0c737a8b
Andreas Huber [Mon, 27 Mar 2017 21:10:09 +0000 (21:10 +0000)]
Merge "Enable --debug option for "lshal" command." am:
16175ca725
am:
674d3acd18
Change-Id: If87550eb68a9c8e280d8863063b4311a44ff6896
Andreas Huber [Mon, 27 Mar 2017 21:07:40 +0000 (21:07 +0000)]
Merge "Enable --debug option for "lshal" command."
am:
16175ca725
Change-Id: Ifa29afcb7677a3ec76a03d5f0365ba4de7ee4c9b
Andreas Huber [Mon, 27 Mar 2017 21:02:30 +0000 (21:02 +0000)]
Merge "Enable --debug option for "lshal" command."
Dan Stoza [Mon, 27 Mar 2017 19:34:43 +0000 (19:34 +0000)]
Merge "libgfx: Remove SafeLog"
Jiwen Cai [Mon, 27 Mar 2017 19:33:59 +0000 (19:33 +0000)]
Merge changes from topic 'libdvr'
* changes:
Add dvr_buffer_queue C API
Move DVR platform C API into libdvr
Mathias Agopian [Tue, 21 Mar 2017 01:07:26 +0000 (18:07 -0700)]
VNDK ANativeWindow API - step 2
The vndk API is a superset of the NDK API.
Prior to this, vendor would have access to
system/window.h which itself is a superset of
what they need, exposes too much of the internals.
With this change, system/window.h depends on
vndk/window.h which depends on
android/native_window.h
Test: compiled, booted Nexus 6P
Bug:
34453351
Change-Id: Iad7bf035143541843309437fe630cc603d96a76e
Mathias Agopian [Mon, 20 Mar 2017 22:48:44 +0000 (15:48 -0700)]
VNDK ANativeWindow API
The vndk API is a superset of the NDK API.
Prior to this, vendor would have access to
system/window.h which itself is a superset of
what they need, exposes too much of the internals.
With this change, system/window.h depends on
vndk/window.h which depends on
android/native_window.h
Test: compiled, booted Nexus 6P
Bug:
34453351
Change-Id: I870e08c652d90b3f2cf4ed7c7ca541ce2893f689
TreeHugger Robot [Mon, 27 Mar 2017 17:15:04 +0000 (17:15 +0000)]
Merge "VR: Rename HIDL service name from vr_hwcomposer to vr"
TreeHugger Robot [Mon, 27 Mar 2017 14:00:29 +0000 (14:00 +0000)]
Merge "Properly recover vr_wm from surface vr_flinger crashes."
TreeHugger Robot [Mon, 27 Mar 2017 09:02:31 +0000 (09:02 +0000)]
Merge "Update native ColorSpace API for libhwui"
Romain Guy [Mon, 27 Mar 2017 07:25:19 +0000 (00:25 -0700)]
Update native ColorSpace API for libhwui
Test: colorspace_test
Bug:
32984164
Change-Id: Id0728bfa90192173eb45c2d26a8b81ce970398d7
Alex Sakhartchouk [Sun, 26 Mar 2017 02:22:16 +0000 (22:22 -0400)]
Properly recover vr_wm from surface vr_flinger crashes.
This is addressing a number of issues:
1) surface_flinger_view_ was incorrectly reset
on de-allocation, which renders vr_wm incapable of seeing
new frames after a crash.
2) dvrGraphicsWaitNextFrame will return -1 if vr_flinger
crashes, which means our graphics context is no longer valid.
We need to de-allocate resources and wait for SF to
reconnect.
3) Displays needed be be de-allocated on SF detach because
they will return incorrect fences on SF re-connect.
4) display_client_ needs to be allocated on demand instead
of at initialization time because vr_flinger crash
invalidates it.
Bug:
36589793
Test: Crash vr_flinger, observe vr_wm working after SF restarts.
Change-Id: I72a79690ee5224e3326c7c571ae4e23797103e6d
Howard Chen [Sat, 25 Mar 2017 09:12:59 +0000 (17:12 +0800)]
This test is used to check if the kernel scheduler
1. supports priority inheritance.
2. utilize the sync flag.
It also make statistic on average, best and worst latency
as well as number of deadline miss with a configurable
deadline specified in us.
The output is in json format hopefully to make it easy
to integrated with present test framework.
usage:
./schd-dbg # test and output json
./schd-dbg -i 1 # number of iterations
./schd-dbg -pair 4 # number of process pairs
./schd-dbg -deadline_us 2500 # deadline in us
./schd-dbg -v # debug
Test: pixel
Change-Id: Idccf0d402dcd7b81c639020364b5ee32075e18cb
John Muir [Fri, 24 Mar 2017 23:32:44 +0000 (23:32 +0000)]
Merge "libdvrcommon: Remove revision code."
John Muir [Fri, 24 Mar 2017 21:43:39 +0000 (14:43 -0700)]
libdvrcommon: Remove revision code.
Move revision to libdvrplatform.
Bug:
36040117
Test: N/A.
Change-Id: I3f70509f9a694383bd7eb94173d5230bd8c66e51
Peng Xu [Fri, 17 Mar 2017 19:20:27 +0000 (12:20 -0700)]
Checks hidl service and remove hidl call at dump
Two things:
* check for hidl service availability before calling any hidl
functions.
* remove hidl dependency on dump to ensure dump will not cause
crash due to hidl failure.
Bug:
36073404
Test: check sensor running after reboot
Test: check dumpsys sensorservice works normally.
Change-Id: I8626635a143a9f07f263f85d95ab16749ea1e452
Alex Vakulenko [Fri, 24 Mar 2017 20:16:20 +0000 (20:16 +0000)]
Merge "Revert "Quick fix to correctly handle empty file/channel handles.""
Andreas Huber [Fri, 24 Mar 2017 20:14:11 +0000 (13:14 -0700)]
Enable --debug option for "lshal" command.
This calls into live binderized services and logs their "IBase::debug(...)"
output.
Bug:
36520620
Test: make, adb shell lshal, adb shell bugreport
Change-Id: Ida3b0c61eafd9f3de562a5df3af24bbaf383de22
Daniel Nicoara [Fri, 24 Mar 2017 19:15:50 +0000 (15:15 -0400)]
VR: Rename HIDL service name from vr_hwcomposer to vr
This is part of an effort to simplify service names.
Bug:
36564122
Test: Ran on device and verified SurfaceFlinger connects to vr_wm
Change-Id: I3e2a2b778f3f0d2066bf5b756263de4b238b2f83
Jiwen 'Steve' Cai [Thu, 23 Mar 2017 00:26:00 +0000 (17:26 -0700)]
Add dvr_buffer_queue C API
Bug:
36401767
Bug:
32213274
Bug:
36266201
Test: build and ran dvr_buffer_queue-test
Change-Id: Icd8d063bd8b7adb15bf67f7e543b87dad1c32a68
Jiwen 'Steve' Cai [Wed, 22 Mar 2017 23:59:53 +0000 (16:59 -0700)]
Move DVR platform C API into libdvr
Introduce a new static library build with Android.mk. The reasoning
behind this is:
1/ This library is going to consolidate all C headers and implementation
of the DVR platform library.
2/ No other internal system components need to depend on this library.
3/ This library is build with Android.mk so that it has depend on other
system components (such as libandroid_runtime) without worrying about
that Android.bp-based libs cannot depent and Androib.mk-based libraries.
4/ This library defines dvr_api.h header as the official definition of
DVR platform library headers. The header is moved from
'vendor/unbundled_google/packages/PrebuiltGoogleVr', which is not an
ideal place to hold the platform library anyway.
5/ If we ever decide to move these C wrappers out of frameworks/native,
this makes it easier to do so by bundling things now.
TODO: C APIs from libvrsensor and libvirtualtouchpadclient are not moved
into this bundle as some functions are still used by internal system
components. Ideally, these will be moved either to Google3 or vendor projects.
Test: Built and flash
Bug:
36563654
Change-Id: Ie5ce89faa70f86ac934a77d8f7d4fca7e94112ee
Alex Vakulenko [Fri, 24 Mar 2017 15:53:50 +0000 (15:53 +0000)]
Revert "Quick fix to correctly handle empty file/channel handles."
This reverts commit
e71fb7d2ab1118d30c5bec8a85114ac610844dc6.
This CL broke PDX unit tests
Bug:
36587839
Change-Id: I5b3cb857aacff337cb9a268a0415f8398303abe8
TreeHugger Robot [Fri, 24 Mar 2017 03:33:26 +0000 (03:33 +0000)]
Merge "media: mechanism to set/get vendor-extension configs for OMX component"
TreeHugger Robot [Fri, 24 Mar 2017 02:39:10 +0000 (02:39 +0000)]
Merge "Remove more EGL_ANDROID_create_native_client_buffer references"
Craig Donner [Fri, 24 Mar 2017 00:55:35 +0000 (17:55 -0700)]
Remove more EGL_ANDROID_create_native_client_buffer references
Bug:
35101209
Test: build
Change-Id: I8709b9881f0133756e2cfcfad3819d4032cfb03e
Yifan Hong [Thu, 23 Mar 2017 23:50:55 +0000 (16:50 -0700)]
Add stub for SensorManager::createEventQueue
It is not yet implemented.
Test: pass
Bug:
35219747
Change-Id: I8ef1627376ac88f552c20a2809416115ba342b82
TreeHugger Robot [Thu, 23 Mar 2017 23:26:14 +0000 (23:26 +0000)]
Merge "Implement an API for vrwm to query if the current vr app is active"
Tim Murray [Thu, 23 Mar 2017 23:09:08 +0000 (23:09 +0000)]
binder: remove cgroup interactions [ DO NOT MERGE ] am:
05f4679d03
am:
400e9a72fd -s ours
Change-Id: Ic31695b9c7a981341ab601638b68f0bb7ef99f28
Tim Murray [Thu, 23 Mar 2017 23:02:25 +0000 (23:02 +0000)]
binder: remove cgroup interactions [ DO NOT MERGE ]
am:
05f4679d03
Change-Id: Idba2f747151fc50866fb470681e50ba64b28b2d0
TreeHugger Robot [Thu, 23 Mar 2017 22:54:01 +0000 (22:54 +0000)]
Merge "Revert "atrace: Make atrace notify VR services of new trace sessions""
Fabien Sanglard [Thu, 23 Mar 2017 22:49:40 +0000 (22:49 +0000)]
Merge "Fix typo in Region to avoid unexpected values" am:
2cbfb0cda6 am:
7fc294e10e
am:
5288e22d00
Change-Id: Ib8095bd01becfacbbcecd0f4ec369ed933eff173
TreeHugger Robot [Thu, 23 Mar 2017 22:47:30 +0000 (22:47 +0000)]
Merge "Dumpstate: dump HAL native traces processes."
Fabien Sanglard [Thu, 23 Mar 2017 22:43:34 +0000 (22:43 +0000)]
Merge "Fix typo in Region to avoid unexpected values" am:
2cbfb0cda6
am:
7fc294e10e
Change-Id: I7feff39e1be80c69a744c4eefad835ba50796f4c
Fabien Sanglard [Thu, 23 Mar 2017 22:38:03 +0000 (22:38 +0000)]
Merge "Fix typo in Region to avoid unexpected values"
am:
2cbfb0cda6
Change-Id: I92a204fa492374c4c69a5d794d974b3cb8f454b3
Treehugger Robot [Thu, 23 Mar 2017 22:26:44 +0000 (22:26 +0000)]
Merge "Fix typo in Region to avoid unexpected values"
Albert Chaulk [Mon, 20 Mar 2017 17:03:39 +0000 (13:03 -0400)]
Implement an API for vrwm to query if the current vr app is active
The API returns if the client_order 0 layer is visible or not. This
aids in 2D app detection
Bug: None
Test: Manual with permissionsgen & calculator
Change-Id: Id988e61a9f93885e93c28ed83ffaffd84f3bdf15
John Reck [Thu, 23 Mar 2017 20:58:29 +0000 (20:58 +0000)]
Revert "atrace: Make atrace notify VR services of new trace sessions"
This reverts commit
213feb32c76bb4ed4262dad8c71f0377ee710fac.
Reason for revert: tracing & perf teams don't want to support PDX at this point in time.
Change-Id: I28b8a7c55c9d31c8469236fb60a6e034b1ef8af7
Mark Urbanus [Thu, 23 Mar 2017 20:58:06 +0000 (20:58 +0000)]
Merge "Enable Universal Bandwidth Compression for textures"
Mark Urbanus [Wed, 22 Mar 2017 20:11:51 +0000 (13:11 -0700)]
Enable Universal Bandwidth Compression for textures
We removed texture compression for VR display surfaces, which introduced memory
bandwidth issues on some QC platforms.
This patch reintroduces texture compression for QC devices compatible with
both gralloc0/gralloc1 implementations.
Bug:
36370337
Test: Validate VR comes up
Change-Id: Ieaaa56f67522c85913476ed0d8da04f8eedbce63
Steven Moreland [Wed, 22 Mar 2017 01:38:05 +0000 (18:38 -0700)]
Dumpstate: dump HAL native traces processes.
Test: hal service dumps in data/anr/bugreport-traces.txt after bugreport
Bug:
36414311
Change-Id: Ifca491d02f77bf4fb26450f06c2ea02769475786