OSDN Git Service
Martijn Coenen [Thu, 11 May 2017 20:17:03 +0000 (20:17 +0000)]
Merge "Only spawn one binder thread for cmd." into oc-dev
am:
31d8ab2e7c
Change-Id: I2cc1e090bb1669bc7ed181c5e3ae65d5b35f77e5
Martijn Coenen [Thu, 11 May 2017 19:48:37 +0000 (19:48 +0000)]
Merge "Only spawn one binder thread for cmd." into oc-dev
Alex Vakulenko [Thu, 11 May 2017 18:33:22 +0000 (18:33 +0000)]
Merge "Apply correct SELinux labels to PDX endpoint and channel sockets." into oc-dev
am:
252e52aa06
Change-Id: Ibaee77dd4f644e3d262719f1188481041293c457
TreeHugger Robot [Thu, 11 May 2017 18:26:46 +0000 (18:26 +0000)]
Merge "Apply correct SELinux labels to PDX endpoint and channel sockets." into oc-dev
Steven Thomas [Thu, 11 May 2017 18:05:32 +0000 (18:05 +0000)]
Merge "Make libdvr a shared library" into oc-dev
am:
1ca4674b72
Change-Id: I4257eb8f7e0b3492b606fb4a96eeeeef2f76627c
Martijn Coenen [Thu, 11 May 2017 16:45:59 +0000 (09:45 -0700)]
Only spawn one binder thread for cmd.
To work around race conditions in libbinder when
spawning new threads while being shut down.
Bug:
36066697
Test: cmd still works
Change-Id: I71c8d1aac29a1bf65d54023a4ed39d943ad54c98
Steven Thomas [Thu, 11 May 2017 17:16:45 +0000 (17:16 +0000)]
Merge "Make libdvr a shared library" into oc-dev
Nicolas Geoffray [Thu, 11 May 2017 12:11:21 +0000 (12:11 +0000)]
Remove obsolete DEXOPT_SAFEMODE.
am:
2520d44e66
Change-Id: I2f053a09a4eeb48bcee07bb0c9509709bb8dc50f
Nicolas Geoffray [Thu, 11 May 2017 10:01:07 +0000 (10:01 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE." am:
4fa2b96d21 am:
d1058fb90c
am:
422eab43cc
Change-Id: I5547f465814d5cd3dca05e0a4c8e0f2473febc75
Nicolas Geoffray [Thu, 11 May 2017 09:59:07 +0000 (09:59 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE." am:
4fa2b96d21
am:
d1058fb90c
Change-Id: Ic9dd064d8eb66f1dd99302c0cfed83a5e4ca2233
Nicolas Geoffray [Thu, 11 May 2017 09:50:31 +0000 (09:50 +0000)]
Merge "Handle safe mode in PackageManager." into oc-dev
am:
89726a1dea
Change-Id: I71dc793457b9f04d91d1863e2a33c70936c63ebd
Nicolas Geoffray [Thu, 11 May 2017 09:48:59 +0000 (09:48 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE."
am:
4fa2b96d21
Change-Id: I652a433fb0e042b79e4289faf74b8b4c6cd84f91
Nicolas Geoffray [Fri, 5 May 2017 13:32:51 +0000 (14:32 +0100)]
Remove obsolete DEXOPT_SAFEMODE.
installd side of the change.
bug:
37929796
Test: build
Change-Id: I358c0784a7b563cbd6ceaecdb80710971f483d02
(cherry picked from commit
bad623a225d0b3d94f30f8654bd4684969e90d4c)
Nicolas Geoffray [Thu, 11 May 2017 09:43:44 +0000 (09:43 +0000)]
Merge "Handle safe mode in PackageManager." into oc-dev
Nicolas Geoffray [Thu, 11 May 2017 09:42:23 +0000 (09:42 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE."
Santos Cordon [Thu, 11 May 2017 05:37:41 +0000 (05:37 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (2/2)" into oc-dev
am:
02207005fa -s ours
Change-Id: I94e6f135f5e49d1514354ae326075ea4bca496f3
Michael Wachenschwanz [Thu, 11 May 2017 05:37:19 +0000 (05:37 +0000)]
Merge "Logging for catching memory issue in Parcel" into oc-dev
am:
c8ddb0171f
Change-Id: Ifc85054fa35bfc89722c8b37337b2d540164d122
Albert Chaulk [Thu, 11 May 2017 05:36:52 +0000 (05:36 +0000)]
Merge "Surfaceflinger: Propagate type & UID from parent layers" into oc-dev
am:
4ba6f99070
Change-Id: Iefbb9bd3c578fe8d8662f7d35422f6f20b8110a1
TreeHugger Robot [Thu, 11 May 2017 03:53:36 +0000 (03:53 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (2/2)" into oc-dev
Santos Cordon [Wed, 5 Apr 2017 17:37:00 +0000 (10:37 -0700)]
Add uniqueId to Virtual Display and pass through to inputflinger (2/2)
This CL adds:
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.
Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input". Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Bug:
36051620
Change-Id: I662f09f863a3dc94c570e7e7f30b83888b3f514c
Merged-In: I662f09f863a3dc94c570e7e7f30b83888b3f514c
Michael Wachenschwanz [Thu, 11 May 2017 01:24:21 +0000 (01:24 +0000)]
Merge "Logging for catching memory issue in Parcel" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 01:03:27 +0000 (01:03 +0000)]
Merge "Surfaceflinger: Propagate type & UID from parent layers" into oc-dev
Alex Vakulenko [Thu, 11 May 2017 00:51:51 +0000 (00:51 +0000)]
Merge "Revert "atrace: Poke PDX services using utility class."" into oc-dev
am:
17cc37dc15
Change-Id: Ic31751da5e2699c9a9e11fd0df716847c0685d7e
Quddus Chong [Thu, 11 May 2017 00:51:31 +0000 (00:51 +0000)]
Merge "docs: Fixed comments to generate API refs correctly. Test: Verified by manually generating the API refs." into oc-dev
am:
a68ae7232b
Change-Id: I15968454d899a4c3f676527b9724b6fbb49fc0bd
Dan Stoza [Thu, 11 May 2017 00:51:10 +0000 (00:51 +0000)]
Merge "SF: Use last call time to rate limit resyncs" into oc-dev
am:
2e252c93ac
Change-Id: Id9ecf8b6aeb8ce3b084c1aa21096a0dc03e3fb7c
Andreas Gampe [Thu, 11 May 2017 00:50:49 +0000 (00:50 +0000)]
Merge "Otapreopt: Work around bug
38186355" into oc-dev
am:
4c8cc1c86a
Change-Id: Ic8b695f766165402fd2f66f54efcf30b76b498fe
Michael Wright [Thu, 11 May 2017 00:50:28 +0000 (00:50 +0000)]
Merge "Correct PowerManager transaction IDs." into oc-dev
am:
5aab417693
Change-Id: I0c9897e77cbd35991dae21aaec06466f8c071316
Yifan Hong [Thu, 11 May 2017 00:38:25 +0000 (00:38 +0000)]
Merge "lshal: remove "// static" comments" am:
8d2f788a05 am:
7d6944d40a
am:
45bf90c166
Change-Id: I3fd98e82715890ed1a83862dfe369a15b316c3ad
Yifan Hong [Thu, 11 May 2017 00:34:24 +0000 (00:34 +0000)]
Merge "lshal: remove "// static" comments" am:
8d2f788a05
am:
7d6944d40a
Change-Id: I36367aa4f5bd756d31855186066cd2e930e32414
Yifan Hong [Thu, 11 May 2017 00:30:23 +0000 (00:30 +0000)]
Merge "lshal: remove "// static" comments"
am:
8d2f788a05
Change-Id: Id2eacee2cd265922954cc3b480015c6fe9efa6d1
Yifan Hong [Thu, 11 May 2017 00:23:58 +0000 (00:23 +0000)]
Merge "lshal: remove "// static" comments"
Yi Kong [Thu, 11 May 2017 00:22:42 +0000 (00:22 +0000)]
Merge "Add explicit default copy constructor" am:
c9810011e9 am:
3bf99597b4
am:
992fa650be
Change-Id: I536ae9a50f5b263c1a60011fdbc1bba269096d1e
Yi Kong [Thu, 11 May 2017 00:04:39 +0000 (00:04 +0000)]
Merge "Add explicit default copy constructor" am:
c9810011e9
am:
3bf99597b4
Change-Id: I1866cb30496b1ad3d49171e1b2b44dcfe44575a3
Steven Thomas [Mon, 8 May 2017 22:45:30 +0000 (15:45 -0700)]
Make libdvr a shared library
Make libdvr a shared library so it can be loaded by the vr platform
library and accessed externally.
Bug:
38134403
Test: Booted a Marlin.
Change-Id: I9914188c80a9a41902fc4000a4f78f877e5e5695
Yi Kong [Wed, 10 May 2017 23:53:19 +0000 (23:53 +0000)]
Merge "Add explicit default copy constructor"
am:
c9810011e9
Change-Id: I4d6198e65c54f3f620c031da3d9fa395d6d3762f
Treehugger Robot [Wed, 10 May 2017 23:35:33 +0000 (23:35 +0000)]
Merge "Add explicit default copy constructor"
Steven Moreland [Tue, 9 May 2017 23:43:46 +0000 (16:43 -0700)]
lshal: remove "// static" comments
Test: pass
Change-Id: I4d710c8aaad87cfcd7896800a5ab24f812775703
Albert Chaulk [Thu, 4 May 2017 20:59:44 +0000 (16:59 -0400)]
Surfaceflinger: Propagate type & UID from parent layers
Bug:
36589137
Test: Launch chrome in VR (surfaceview has a parent)
Change-Id: I9320a8df249d1d5790323b22f0ba88a792f9468f
Yi Kong [Wed, 10 May 2017 21:27:39 +0000 (14:27 -0700)]
Add explicit default copy constructor
Definition of implicit copy constructor is deprecated if it has a
user-declared destructor. This triggers -Wdeprecated compiler warning
and breaks the build in latest Clang update.
Test: Build
Bug:
37752547
Change-Id: I467d5ff3b4cca4644c7ec8c99ae35556029ce509
TreeHugger Robot [Wed, 10 May 2017 21:18:46 +0000 (21:18 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (2/2)" into oc-dev-plus-aosp
TreeHugger Robot [Wed, 10 May 2017 20:25:35 +0000 (20:25 +0000)]
Merge "Revert "atrace: Poke PDX services using utility class."" into oc-dev
Alex Klyubin [Wed, 10 May 2017 19:54:42 +0000 (19:54 +0000)]
Merge "Switch from libcrypto_static to libcrypto target" am:
612c12b293 am:
4c246fe5df
am:
25eacb0b5e -s ours
Change-Id: I0142405d334c5615fbc10201716d1d312b3686a9
Quddus Chong [Wed, 10 May 2017 19:52:40 +0000 (19:52 +0000)]
Merge "docs: Fixed comments to generate API refs correctly. Test: Verified by manually generating the API refs." into oc-dev
Alex Klyubin [Wed, 10 May 2017 19:43:11 +0000 (19:43 +0000)]
Merge "Switch from libcrypto_static to libcrypto target" am:
612c12b293
am:
4c246fe5df
Change-Id: I6f49fd3560dc03de06cba7e06e039e98e55d697e
Alex Klyubin [Wed, 10 May 2017 19:40:11 +0000 (19:40 +0000)]
Merge "Switch from libcrypto_static to libcrypto target"
am:
612c12b293
Change-Id: I12980dcc8ea7b809b87199e9d7959202a7abc385
Alex Klyubin [Wed, 10 May 2017 19:25:30 +0000 (19:25 +0000)]
Merge "Switch from libcrypto_static to libcrypto target"
TreeHugger Robot [Wed, 10 May 2017 19:19:59 +0000 (19:19 +0000)]
Merge "SF: Use last call time to rate limit resyncs" into oc-dev
Michael Wachenschwanz [Mon, 8 May 2017 21:26:41 +0000 (14:26 -0700)]
Logging for catching memory issue in Parcel
Added a check to catch a bug that is suspected to lead to a segfault
during GC. Actual fix for the bug is commented and will be checked in
once the flow that is hitting the bug is uncoverered
Bug:
37298089
Test: manual
Change-Id: I68dea02566a9e9375e3a09d4cc19e39379d84747
Signed-off-by: Michael Wachenschwanz <mwachens@google.com>
Alex Vakulenko [Wed, 10 May 2017 18:32:52 +0000 (18:32 +0000)]
Revert "atrace: Poke PDX services using utility class."
This reverts commit
f70680e995d6df4604c9b34f6a5afebe613d7feb.
There appears to be a bug in the current build system that does not
cleanly rebuild all targets using static libraries built across
different build systems (Soong/make). With the recent change to PDX
connection handshake, it is important that all clients and services are
rebuilt to include the new protocol changes. However this is not the
case when doing incremental builds. Some services remain untouched
during global builds and hence there is a disparity in clients' and
services' implementations of the protocol.
atrace being one of the clients is affected (the symptom is that when
started atrace just hangs waiting for connection to a PDX service).
While there is nothing wrong with the current state of code, but the
issue of incomplete incremental builds is causing headaches for people
trying to chase performance issues in O with systrace (since it is
unclear that they need to do a clean build).
Reverting the dependency on PDX in atrace for now until the build system
issue is identified and fixed property. This change can be re-landed then.
Bug:
38201226
Change-Id: Ica0efc38f600295ef6f64b9f9584ac41cb84f424
Santos Cordon [Wed, 5 Apr 2017 17:37:00 +0000 (10:37 -0700)]
Add uniqueId to Virtual Display and pass through to inputflinger (2/2)
This CL adds:
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.
Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input". Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Bug:
36051620
Change-Id: I662f09f863a3dc94c570e7e7f30b83888b3f514c
TreeHugger Robot [Wed, 10 May 2017 17:31:52 +0000 (17:31 +0000)]
Merge "Otapreopt: Work around bug
38186355" into oc-dev
Quddus Chong [Tue, 9 May 2017 21:43:16 +0000 (14:43 -0700)]
docs: Fixed comments to generate API refs correctly.
Test: Verified by manually generating the API refs.
Change-Id: I77f2072d2aa83a6c71e11b216e206c4e6563ab88
Alex Vakulenko [Tue, 2 May 2017 00:54:24 +0000 (17:54 -0700)]
Apply correct SELinux labels to PDX endpoint and channel sockets.
Bug:
37646189
Test: Compiled for sailfish-eng
Device booted, normal 2D UI works as before
Was able to run Daydream app and CubeSea (before O1 VR rendering
path was disabled by recent change in HW composer).
Change-Id: I1f7040324992d3c784f072ea6b64a65fa7ed0589
Nicolas Geoffray [Fri, 5 May 2017 13:32:51 +0000 (14:32 +0100)]
Remove obsolete DEXOPT_SAFEMODE.
installd side of the change.
bug:
37929796
Test: build
(cherry picked from commit
bad623a225d0b3d94f30f8654bd4684969e90d4c)
Change-Id: Ice855d20184443a641e081efa4ec943326ccefdd
Andreas Gampe [Wed, 10 May 2017 15:18:06 +0000 (08:18 -0700)]
Otapreopt: Work around bug
38186355
Temporarily also accept a malformed string for null.
Bug:
38186355
Test: m
Test: manual OTA
Change-Id: I19d527d04b86596551f7bed54221c67be06c34c7
TreeHugger Robot [Wed, 10 May 2017 14:40:19 +0000 (14:40 +0000)]
Merge "Correct PowerManager transaction IDs." into oc-dev
Mike Stroyan [Wed, 10 May 2017 14:10:11 +0000 (14:10 +0000)]
Merge "egl: recover from failed eglMakeCurrent" into oc-dev
am:
35c63d456a
Change-Id: If62e2d89620bc7f464779a3db2c6f977bf34f7de
Mike Stroyan [Wed, 10 May 2017 13:57:06 +0000 (13:57 +0000)]
Merge "egl: recover from failed eglMakeCurrent" into oc-dev
Nicolas Geoffray [Wed, 3 May 2017 12:21:37 +0000 (13:21 +0100)]
Handle safe mode in PackageManager.
installd side of the change.
bug:
37929796
Test: manual OTA with a safemode app.
(cherry picked from commit
be6ecd6f6141de1ecd4ec6eb5885bdd0f655fafa)
Change-Id: I43dcdd3fea3f62398f16f89348c1a2f1b4b1bb6d
Nicolas Geoffray [Wed, 10 May 2017 10:58:02 +0000 (10:58 +0000)]
Merge "Always unlink the out_vdex_file." into oc-dev
am:
6949ec68e7
Change-Id: I2e9bf76d52567191bdceccbadc95defbb7a0fd0f
Nicolas Geoffray [Wed, 10 May 2017 10:48:14 +0000 (10:48 +0000)]
Merge "Always unlink the out_vdex_file." into oc-dev
Nicolas Geoffray [Wed, 10 May 2017 09:31:15 +0000 (09:31 +0000)]
Merge "Always unlink the out_vdex_file." am:
fbb09a7192 am:
e5a1bc620b
am:
2087818222
Change-Id: Iab9661cb66924b200263acaac4ce4f2876481a52
Nicolas Geoffray [Wed, 10 May 2017 09:21:15 +0000 (09:21 +0000)]
Merge "Always unlink the out_vdex_file." am:
fbb09a7192
am:
e5a1bc620b
Change-Id: Ib4ecf1c85ec826edee1de3cd11e565d0ecaf7114
Nicolas Geoffray [Wed, 10 May 2017 09:11:48 +0000 (09:11 +0000)]
Merge "Always unlink the out_vdex_file."
am:
fbb09a7192
Change-Id: If1eed0f380172f05b4fbd7a8f853a9d7db6f4aa7
Nicolas Geoffray [Tue, 9 May 2017 13:20:09 +0000 (14:20 +0100)]
Always unlink the out_vdex_file.
Even if we pass the same vdex file as input and output to
dex2oat, make sure we unlink it if dex2oat failed.
bug:
38113240
Test: manual, killing dex2oat invocation
(cherry picked from commit
7bb165779f59bfa1324ca991f64ab98331a410b5)
Change-Id: I157b3d33179b5bff1ca38750bee24aab01c5a19b
Nicolas Geoffray [Wed, 10 May 2017 08:52:29 +0000 (08:52 +0000)]
Merge "Always unlink the out_vdex_file."
Luke Song [Wed, 10 May 2017 05:29:12 +0000 (05:29 +0000)]
Merge "Move sensord" into oc-dev
am:
903726f55b
Change-Id: I6c55dc0e0e24b418cf33ec5e469f4c00411b63ce
Luke Song [Wed, 10 May 2017 05:16:03 +0000 (05:16 +0000)]
Merge "Move sensord" into oc-dev
Lajos Molnar [Wed, 10 May 2017 02:57:54 +0000 (02:57 +0000)]
Merge "bufferqueue: allow null stream in H2BGBP::setSidebandStream" into oc-dev
am:
7fe71f8b0f
Change-Id: I449c8e4100044d3cea0135f2a966c018ed5e03ec
Jiwen 'Steve' Cai [Wed, 10 May 2017 02:57:18 +0000 (02:57 +0000)]
Merge "Split libdvr_headers from libdvr: Step 1" into oc-dev
am:
2eb4922a7b
Change-Id: I84efc214e668bd17bfa7f59797fdaa7344772b61
TreeHugger Robot [Wed, 10 May 2017 02:51:50 +0000 (02:51 +0000)]
Merge "bufferqueue: allow null stream in H2BGBP::setSidebandStream" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 02:46:32 +0000 (02:46 +0000)]
Merge "Split libdvr_headers from libdvr: Step 1" into oc-dev
Quddus Chong [Tue, 9 May 2017 21:25:48 +0000 (21:25 +0000)]
docs: Fixed doc comments to enable Doxygen to generate code block correctly. Test: Verified by manually generating docs.
am:
5163357fc0
Change-Id: I209ee283991ca3e341923a52a132fc08a63b5398
Daniel Nicoara [Tue, 9 May 2017 21:25:12 +0000 (21:25 +0000)]
Remove vr_wm service (try 2)
am:
007b00e775
Change-Id: Ib5794017f2c0ac8ef48db94d15a597b97b23246b
Lajos Molnar [Tue, 9 May 2017 20:52:30 +0000 (13:52 -0700)]
bufferqueue: allow null stream in H2BGBP::setSidebandStream
Bug:
38172844
Change-Id: I585e1dc01f2e7f955c39046c1592bda7bea45a23
Quddus Chong [Tue, 9 May 2017 17:39:23 +0000 (10:39 -0700)]
docs: Fixed doc comments to enable Doxygen to generate code block correctly.
Test: Verified by manually generating docs.
Change-Id: Id79a77e71deb26e0dd5d22843c2f09d9000e587d
Jiwen 'Steve' Cai [Tue, 9 May 2017 00:07:52 +0000 (17:07 -0700)]
Split libdvr_headers from libdvr: Step 1
Converts libdvr's Android file into Android.bp as now we have no Java
deps anymore. Then we added header only library libdvr_headers for all
headers.
Next step is to figure out how to split out public headers and make them
easy to be copied into Google3.
Bug:
37578558
Test: dvr_api-test
Change-Id: Idf15cfd5aa61cd7d6f5cc15c4db7cce485b3b293
Daniel Nicoara [Mon, 8 May 2017 20:44:42 +0000 (16:44 -0400)]
Remove vr_wm service (try 2)
VR Window Manager has moved to VrCore. Removing deprecated code.
Bug:
36051907
Test: Compiled and verified VR still works.
Change-Id: Iea0c7646df8a068c058099cf19ef7d76bbf89192
Nicolas Geoffray [Tue, 9 May 2017 13:20:09 +0000 (14:20 +0100)]
Always unlink the out_vdex_file.
Even if we pass the same vdex file as input and output to
dex2oat, make sure we unlink it if dex2oat failed.
bug:
38113240
Test: manual, killing dex2oat invocation
Change-Id: I406014f97a2c3b2bd646e13b5d86dfa0eaa2692f
Hendrik Wagenaar [Tue, 9 May 2017 10:05:07 +0000 (10:05 +0000)]
Merge "dvrapi: Pass layer_count down" into oc-dev
am:
9a2b294255
Change-Id: Ie420d2d8ef6202a56e156f34c760cafd37b5fd0e
TreeHugger Robot [Tue, 9 May 2017 10:00:37 +0000 (10:00 +0000)]
Merge "dvrapi: Pass layer_count down" into oc-dev
Hendrik Wagenaar [Tue, 9 May 2017 08:11:00 +0000 (08:11 +0000)]
Merge "Remove slices from buffers" into oc-dev
am:
5c91f12131
Change-Id: I7538f77b09b4931a5b4409f7317663aba17c40bd
TreeHugger Robot [Tue, 9 May 2017 08:03:02 +0000 (08:03 +0000)]
Merge "Remove slices from buffers" into oc-dev
Hendrik Wagenaar [Tue, 9 May 2017 06:44:19 +0000 (06:44 +0000)]
Merge "Remove framebuffer_target" into oc-dev
am:
c6c0c9c730
Change-Id: I6d65d8fb4d0586228890327c478bfce57cf3c7f7
TreeHugger Robot [Tue, 9 May 2017 06:37:01 +0000 (06:37 +0000)]
Merge "Remove framebuffer_target" into oc-dev
Hendrik Wagenaar [Mon, 8 May 2017 05:19:17 +0000 (22:19 -0700)]
dvrapi: Pass layer_count down
* We were missing layer count, which would prevent multiview
from working
Bug:
37245304
Test: MultiLayerBufferQueue
Change-Id: I88b41f1aa7665df01e89a7386cbc23b15c9a79b0
Hendrik Wagenaar [Sun, 7 May 2017 05:36:04 +0000 (22:36 -0700)]
Remove slices from buffers
* code no longer required, as it will be handled in vrcore
Bug:
38076195
Test: Manually ran testing
Change-Id: Id28918a3bf73b99cbb57aad4c21251b7a9623074
Hendrik Wagenaar [Tue, 9 May 2017 05:10:49 +0000 (05:10 +0000)]
Merge "remove vr/libeds" into oc-dev
am:
db768fd8e5
Change-Id: I46f312ee39adb1239d1c97f676a730dad00bd10b
TreeHugger Robot [Tue, 9 May 2017 05:06:15 +0000 (05:06 +0000)]
Merge "remove vr/libeds" into oc-dev
Jiwen 'Steve' Cai [Tue, 9 May 2017 01:46:38 +0000 (01:46 +0000)]
Merge "Fix BufferHubQueueProducer::dequeueBuffer" into oc-dev
am:
1134dd38d8
Change-Id: I73fc24cadc2c647b3c0a507b30b625ffaf8536ca
TreeHugger Robot [Tue, 9 May 2017 01:29:31 +0000 (01:29 +0000)]
Merge "Fix BufferHubQueueProducer::dequeueBuffer" into oc-dev
Stephen Kiazyk [Tue, 9 May 2017 00:39:31 +0000 (00:39 +0000)]
Merge "Prevent buggy display orientation when exiting vr" into oc-dev
am:
95d4e52244
Change-Id: Ie146b08ded70a24bbdc4b681c72724807e26717e
TreeHugger Robot [Tue, 9 May 2017 00:32:21 +0000 (00:32 +0000)]
Merge "Prevent buggy display orientation when exiting vr" into oc-dev
Ian Elliott [Mon, 8 May 2017 23:55:29 +0000 (23:55 +0000)]
Merge "Return an error if apiVersion is 1.1+." into oc-dev
am:
8c109c638a
Change-Id: I1e4e17b02155a4095d28cfff8791f63b7dcd3d08
TreeHugger Robot [Mon, 8 May 2017 23:50:34 +0000 (23:50 +0000)]
Merge "Return an error if apiVersion is 1.1+." into oc-dev
Jiwen 'Steve' Cai [Mon, 8 May 2017 23:02:36 +0000 (16:02 -0700)]
Fix BufferHubQueueProducer::dequeueBuffer
Seems this might just be a rebase glitch.
Bug:
38137230
Test: buffer_hub_queue_producer-test
Change-Id: I94ce059475fad4cf31cec52a9661eb6fc9cd2e00
Calin Juravle [Mon, 8 May 2017 23:23:56 +0000 (23:23 +0000)]
Merge "Do not return an error if the dalvik-cache odex is missing" into oc-dev
am:
d6ca10b76d
Change-Id: I0ff52940cbce928720fcdbb08ee0ad2da8a55be0
TreeHugger Robot [Mon, 8 May 2017 23:20:12 +0000 (23:20 +0000)]
Merge "Do not return an error if the dalvik-cache odex is missing" into oc-dev
Ian Elliott [Mon, 8 May 2017 21:59:09 +0000 (15:59 -0600)]
Return an error if apiVersion is 1.1+.
The Vulkan loader is supposed to check the requested apiVersion and return
VK_ERROR_INCOMPATIBLE_DRIVER if the requested version is not supported. The
loader wasn't performing the check, nor returning the error. A log message is
also issued, explaining why the application failed to create an instance.
Bug:
38040828
Test: Modify cube to use 1.0 or 1.1 and ensure proper return value.
Change-Id: I8cc792305a346c6e1db40f61d5235c301d8ae848
Hendrik Wagenaar [Mon, 8 May 2017 21:45:44 +0000 (14:45 -0700)]
Remove framebuffer_target
* Remove unused variable
Bug:
38132845
Test: Compiled
Change-Id: I08afba75b72c3d27aca042755bf36584979c7f0c