OSDN Git Service
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
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
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
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
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"
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
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, 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
Calin Juravle [Thu, 4 May 2017 00:22:27 +0000 (17:22 -0700)]
Do not return an error if the dalvik-cache odex is missing
Test: adb shell /data/nativetest/installd_service_test/installd_service_test
Tried uninstalling an updated version of prebuilt app.
Didn't find the error message in the logcat.
Bug:
35804241
Change-Id: Iec045fa9c9ac8f036785fe5cbd0f7e43f2b680c1
Alex Klyubin [Mon, 8 May 2017 21:12:57 +0000 (14:12 -0700)]
Switch from libcrypto_static to libcrypto target
libcrypto target offers the same static library as libcrypto_static.
Thus, there's no need to use libcrypto_static.
Test: make dumpstate
dumpstate binary unchanged by this commit
Bug:
26160319
Change-Id: I62ca775870482386f0bb7ce1e2f8c94cf6f0342a
Jim Kaye [Mon, 8 May 2017 20:07:26 +0000 (20:07 +0000)]
Fix enforcement of sensor's slowest rate
am:
663720b29f
Change-Id: I31ff9da171baa83318bc794553c7057b18be2dec
Mike Stroyan [Mon, 8 May 2017 16:47:24 +0000 (10:47 -0600)]
egl: recover from failed eglMakeCurrent
Some drivers don't actually restore current context when
eglMakeCurrent fails. Restore the current context directly.
Bug:
37244059
Change-Id: I857da78078dd212b523d690415cf525ecd463961
Fixes:
37244059
Test: android.server.cts.ActivityManagerDisplayTests
Jim Kaye [Mon, 8 May 2017 16:07:27 +0000 (09:07 -0700)]
Fix enforcement of sensor's slowest rate
This code calculates a sensor's maximum sample
period in nanoseconds. This is stored as a 64-bit
value, as required for periods greater than ~2.1
seconds.
The calculation was done with 32-bit arithmetic,
sometimes resulting in overflow. This caused the
sensor to run at its maximum rate.
(The requested period is first clipped to the maximum
period. When the maximum period appears negative, it
is always used. The now-negative period is then clipped
to the minimum period, resulting in the sensor's maximum
supported rate.)
Bug:
37465457
Test: Verified correct operation with Goldfish accelerometer,
which has a 60-second maximum period.
Change-Id: Ic75a9dc7c4e7c9ca690eafbfa51ee50540ca5aaf
Alex Vakulenko [Sun, 7 May 2017 16:35:54 +0000 (16:35 +0000)]
Merge "libpdx_uds: Always create channel sockets in the server process" into oc-dev
am:
584bc3cebf
Change-Id: I3f96c9639bb192bf651db005d11afa1cdf4ebd43
TreeHugger Robot [Sun, 7 May 2017 16:30:05 +0000 (16:30 +0000)]
Merge "libpdx_uds: Always create channel sockets in the server process" into oc-dev
Hendrik Wagenaar [Sun, 7 May 2017 03:45:09 +0000 (20:45 -0700)]
remove vr/libeds
* libeds is no longer needed
Bug:
38075841
Test: compiled
Change-Id: I61b7edb284633ab8e960387c0479b1a924d68222
Martijn Coenen [Sat, 6 May 2017 04:49:41 +0000 (04:49 +0000)]
Merge "Correctly set minimum priority on nodes." into oc-dev
am:
fc93a4bd89
Change-Id: If7cb26f43e85a11cb99ce9be511c44d35ddaca02
Martijn Coenen [Sat, 6 May 2017 04:46:45 +0000 (04:46 +0000)]
Merge "Correctly set minimum priority on nodes." into oc-dev
Jeff Sharkey [Sat, 6 May 2017 02:09:04 +0000 (02:09 +0000)]
Merge "Clear cached files on external storage." into oc-dev
am:
4b567487b7
Change-Id: Ib979f876c37632b723e6a982dc48ec746aaef290
Jeff Sharkey [Sat, 6 May 2017 01:58:07 +0000 (01:58 +0000)]
Merge "Clear cached files on external storage." into oc-dev
Yifan Hong [Sat, 6 May 2017 00:42:22 +0000 (00:42 +0000)]
Merge "Fix lshal --init-vintf may have empty <instance> tags." am:
4a9b7174ca am:
0a1b8a1128
am:
bf578bcc61
Change-Id: Ibf2e5b42970b3d5a55e021225cf47af0c1fd94e8
Yifan Hong [Sat, 6 May 2017 00:28:25 +0000 (00:28 +0000)]
Merge "Fix lshal --init-vintf may have empty <instance> tags." am:
4a9b7174ca
am:
0a1b8a1128
Change-Id: I007fb20df553c2cec9d9e88a9ae79a4f523acfc6
Yifan Hong [Sat, 6 May 2017 00:19:06 +0000 (00:19 +0000)]
Merge "Fix lshal --init-vintf may have empty <instance> tags."
am:
4a9b7174ca
Change-Id: Ic6eeff994ab0fb8e2e30dd7c200d9eab512cf057
Treehugger Robot [Sat, 6 May 2017 00:11:31 +0000 (00:11 +0000)]
Merge "Fix lshal --init-vintf may have empty <instance> tags."
Jeff Sharkey [Wed, 3 May 2017 17:36:42 +0000 (11:36 -0600)]
Clear cached files on external storage.
When clearing cached files belonging to an app, include any cached
files on external storage. Since we need to keep sdcardfs in the
loop about any file deletions, we always mutate by going through the
sdcardfs layer instead of behind its back.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug:
37486230,
37566983,
37913442,
37914374
Change-Id: If174bf7eaf682da83cf0ab1b4938fe9a5956d464
Corey Tabaka [Fri, 5 May 2017 20:42:59 +0000 (20:42 +0000)]
Merge changes from topic 'o-compositor-unification' into oc-dev
am:
0e04fe4713
Change-Id: Ie819585288871279d6de56290c7939b1c9ab63aa
Corey Tabaka [Fri, 5 May 2017 20:42:37 +0000 (20:42 +0000)]
Merge "Revert "Deprecate producer/consumer usage: Step 3"" into oc-dev
am:
cffef95674
Change-Id: I9bc11e913ec84acbbe90a255ed95851dc1d953d0
TreeHugger Robot [Fri, 5 May 2017 20:37:26 +0000 (20:37 +0000)]
Merge changes from topic 'o-compositor-unification' into oc-dev
* changes:
Remove the VR compositor from the framework.
Remove unnecessary clients and rename files.
Support multiple consumer queues.
Return pdx::Status<T> from BufferHubQueue::Dequeue.
Add support for consumer queue initial import and hangup.
TreeHugger Robot [Fri, 5 May 2017 20:32:30 +0000 (20:32 +0000)]
Merge "Revert "Deprecate producer/consumer usage: Step 3"" into oc-dev
Kevin Schoedel [Fri, 5 May 2017 20:14:25 +0000 (20:14 +0000)]
Merge "Switch touch input device on hover events." into oc-dev
am:
5a3361d2ed
Change-Id: Ic51df53ed3be731d52e18ee0e95e9f7e87509cf7
TreeHugger Robot [Fri, 5 May 2017 20:02:52 +0000 (20:02 +0000)]
Merge "Switch touch input device on hover events." into oc-dev
Martijn Coenen [Fri, 5 May 2017 18:16:59 +0000 (11:16 -0700)]
Correctly set minimum priority on nodes.
It looks like libbinder has always set the minimum priority
for a node to 0x7f (127). This is an invalid value as far
as the kernel is concerned, since the current driver only
accepts positive nice values (0..19). The effect of using
0xf7 is that the nice value was clamped to MAX_NICE (19) -
so effectively the kernel never raised the priority
based on the min_priority setting of a node. Correct this
by just using MAX_NICE directly.
Additionally, a recent change removed the use of the
gDisableBackgroundScheduling flag, which system_server
used to make sure that incoming transactions were not
executed at a lower priority. That behavior is actually
still desired, so this change sets the min_priorirty
value to 0 for processes that have requested background
scheduling to be disabled. The effect of that is that
all transactions into those nodes will be executed with
a priority of at least nice 0 (and potentially higher,
depending on the priority of the caller).
Bug:
37677242
Test: verified /d/binder output
Change-Id: I7cbfd309d04cbd052f868fbfe0930529ff21a48a
TreeHugger Robot [Fri, 5 May 2017 18:21:42 +0000 (18:21 +0000)]
Merge "Remove redundant dependencies" into oc-dev-plus-aosp
Corey Tabaka [Fri, 5 May 2017 18:14:54 +0000 (18:14 +0000)]
Revert "Deprecate producer/consumer usage: Step 3"
These changes are effectively handled as part of another, higher priority CL.
This reverts commit
7cab28591d5cdc26913a0882df1b28e3f5393066.
Change-Id: I4cf47eee219870b2758997fe5bd6019d83b82451
Jiwen Cai [Fri, 5 May 2017 17:05:20 +0000 (17:05 +0000)]
Merge "Deprecate producer/consumer usage: Step 3" into oc-dev
am:
944be994f8
Change-Id: I63b35ceb9fe4adaaf1bdbc52eb14d003182346bf
Jiwen Cai [Fri, 5 May 2017 16:58:47 +0000 (16:58 +0000)]
Merge "Deprecate producer/consumer usage: Step 3" into oc-dev
Daniel Nicoara [Fri, 5 May 2017 15:25:15 +0000 (15:25 +0000)]
Merge "Revert "Remove vr_wm service"" into oc-dev
am:
ef2d2a0d15
Change-Id: Id8a2bd3c93c38b466d87c1c9f09f63bf949efff2
Daniel Nicoara [Fri, 5 May 2017 15:20:25 +0000 (15:20 +0000)]
Merge "Revert "Remove vr_wm service"" into oc-dev
Daniel Nicoara [Fri, 5 May 2017 15:08:12 +0000 (15:08 +0000)]
Revert "Remove vr_wm service"
This reverts commit
efd3e0873e24f25e855bb64fae8485fc04690d56.
Reason for revert: IVrWindowManager.aidl is still used in frameworks/base
Change-Id: Id52fb8cf482ea5ab141ebf6b304c12b18a9d8070
Daniel Nicoara [Fri, 5 May 2017 15:01:14 +0000 (15:01 +0000)]
Merge "Remove vr_wm service" into oc-dev
am:
3bfcfeb12e
Change-Id: Ie8937890f4a689073b78ac593c706674dcc366f2
Daniel Nicoara [Fri, 5 May 2017 14:56:17 +0000 (14:56 +0000)]
Merge "Remove vr_wm service" into oc-dev
Nicolas Geoffray [Fri, 5 May 2017 10:36:27 +0000 (11:36 +0100)]
resolve merge conflicts of
7827bcc3e to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib00772a1460f0d066366edec8df35831f1039ac3
Nicolas Geoffray [Fri, 5 May 2017 08:54:06 +0000 (08:54 +0000)]
Merge "Handle safe mode in PackageManager." am:
7a45fd929a
am:
de18423ff8
Change-Id: Ia6806efa144248a36114b6e65329d60ab960c698
Nicolas Geoffray [Fri, 5 May 2017 08:46:01 +0000 (08:46 +0000)]
Merge "Handle safe mode in PackageManager."
am:
7a45fd929a
Change-Id: Icd7bf11cb3bdc3acdf3414a3ba13cd7964e13f3b
Nicolas Geoffray [Fri, 5 May 2017 08:37:16 +0000 (08:37 +0000)]
Merge "Handle safe mode in PackageManager."
Corey Tabaka [Thu, 20 Apr 2017 23:04:07 +0000 (16:04 -0700)]
Remove the VR compositor from the framework.
Remove the VR compositor framework and enable out-of-process VR composition
in VrCore.
This CL seems large due to the ripple effect of changing the VrFlinger
API and protocol types. There are three major modules that require
concurrent changes:
1. Protocol definitions and low-level VrFlinger API in libdisplay.
* Additional changes needed to keep old interfaces working for
a short time while replacing the dependent code (dvrGraphics*).
2. VrFlinger service implementation changes to support VrCore compositor
and the removal of the internal compositor.
3. Changes to libdvr platform library API due to changes in #1 and #2.
Because of the nature of the interdependence of types and other defs it is
difficult to break this CL into smaller chunks. However, review of the three
major modules (libdisplay, libdvr, and libvrflinger) may be done separately
to ease the mental burden on reviewers.
Change Summary:
- Remove obsolete screenshot service. VR screenshots will be implemented
by VrCore.
- Update display protocol definitions for changes in VrFlinger service
requirements. The majority of the changes in libdisplay are a
consequence of these protocol and service changes.
- Update VrFlinger to support two kinds of surfaces:
1. Application - use by VR apps.
2. Direct - used by VrCore (protected by permission check).
- Remove VrFlinger internal compositor and GL context.
- Remove obsolete debug console.
- Update VrFlinger hardware composer interface to handle direct
surfaces only, removing the concept of GPU (compositor) layers.
- Update display manager to expose access to application surface info
to VrCore (protected by permission check).
- Update libdvr platform library interfaces for changes to VrFlinger
API / protocol.
- Clean up libdvr API struct setup using a common include.
- Add C++ header-only helpers for DVR platform library opaque types.
Bug:
36401174
Test: Build; run VrFlinger display test tool.
Change-Id: I15abfde5f72dbb3725a3f58621486afba6b64902
Tim Murray [Fri, 5 May 2017 00:56:37 +0000 (00:56 +0000)]
Merge "surfaceflinger: make EventThread FIFO" into oc-dev
am:
0ad5feff27
Change-Id: Id59b34906f6a79420c75a2377e7f86906b6e81f0
Carmen Jackson [Fri, 5 May 2017 00:44:27 +0000 (00:44 +0000)]
Merge "Revert "Set the atrace clock to boot when possible and mono otherwise."" into oc-dev
am:
7fccc2079e
Change-Id: I183fd416c85c85ea1549eae2a417ef0a95b9a5bf
TreeHugger Robot [Fri, 5 May 2017 00:43:40 +0000 (00:43 +0000)]
Merge "surfaceflinger: make EventThread FIFO" into oc-dev