OSDN Git Service
Steven Moreland [Fri, 10 Mar 2017 18:09:51 +0000 (10:09 -0800)]
RegionHelper.h: include <limits> directly.
Includes are transitively imported by <string> in String8.h + String16.h
but that include is being removed.
Test: pass
Change-Id: I378d533ee5445bc0286c7535581a491f55ca36c9
Steven Moreland [Fri, 10 Mar 2017 18:08:45 +0000 (10:08 -0800)]
opengl egl_object.h: add <atomic> include.
Includes are transitively imported by <string> in String8.h + String16.h
but that include is being removed.
Test: pass
Change-Id: I6176389d41aa5eb6fdf8b8afe3378eeb877bc525
Mathias Agopian [Thu, 9 Mar 2017 21:53:58 +0000 (21:53 +0000)]
Merge changes from topic 'igraphicbufferallocator'
* changes:
get rid of IGraphicBufferAlloc
Remove a dependency of EGL on ui/GraphicBuffer.h
remove EGL dependency on libbinder
Nicolas Geoffray [Thu, 9 Mar 2017 21:13:09 +0000 (21:13 +0000)]
Merge "Disable input-vdex when doing speed-profile." am:
028ad63e80 am:
a5582c290c
am:
a15409a340
Change-Id: I3261131e0f71f6305cdb177ef227ab114be23c60
Nicolas Geoffray [Thu, 9 Mar 2017 21:07:35 +0000 (21:07 +0000)]
Merge "Disable input-vdex when doing speed-profile." am:
028ad63e80
am:
a5582c290c
Change-Id: I297b481892c75babde5b239bf6b1fe4e3701244e
Nicolas Geoffray [Thu, 9 Mar 2017 21:04:06 +0000 (21:04 +0000)]
Merge "Disable input-vdex when doing speed-profile."
am:
028ad63e80
Change-Id: I3ec636cd526bcdb749fc3af87f2ac0d301fbcafd
Nicolas Geoffray [Thu, 9 Mar 2017 20:56:53 +0000 (20:56 +0000)]
Merge "Disable input-vdex when doing speed-profile."
Nicolas Geoffray [Thu, 9 Mar 2017 13:11:25 +0000 (13:11 +0000)]
Disable input-vdex when doing speed-profile.
input-vdex and dexlayout are incompatible with each other.
bug:
36084905
bug:
36076104
bug:
36059948
bug:
35872504
Test: device boots, vdex works on OTA, input-vdex is not passed
for speed-profile.
Change-Id: I194311041899399db422867670f5e788d6b9ceeb
Mathias Agopian [Tue, 28 Feb 2017 02:17:44 +0000 (18:17 -0800)]
get rid of IGraphicBufferAlloc
buffers can now be allocated in-process.
Test: compile & run
Bug: cleanup
Change-Id: I3d4317a9bed20a6d8be2b7ac8fbb85738efb3657
Mathias Agopian [Sat, 25 Feb 2017 00:38:15 +0000 (16:38 -0800)]
Remove a dependency of EGL on ui/GraphicBuffer.h
the conversion to a ANativeWindowBuffer is now
handled by libnativewindow.
Test: compiled & run
Bug: cleanup
Change-Id: I52dd64574afbc1eff5bdbefacec234a79f8acd97
Mathias Agopian [Tue, 7 Feb 2017 20:59:18 +0000 (12:59 -0800)]
remove EGL dependency on libbinder
This gets rid of the
eglCreateNativeClientBufferANDROID extension,
which is replaced by NDK’s AHardwareBuffer.
Bug:
35101209
Test: Not tested yet
Change-Id: I7905eb875139781a23e9fa0b3447ea1ad25c71cf
TreeHugger Robot [Thu, 9 Mar 2017 03:04:07 +0000 (03:04 +0000)]
Merge "Create libhwc2on1adapter"
Yifan Hong [Thu, 9 Mar 2017 03:03:15 +0000 (03:03 +0000)]
Merge changes from topic 'vintf_arch' am:
45370128a5 am:
c2b36f5696
am:
628dafc85e
Change-Id: Ib17fb1e919fdc5a1d3ce652debf1f0d530fde57f
Yifan Hong [Thu, 9 Mar 2017 03:00:44 +0000 (03:00 +0000)]
Merge changes from topic 'vintf_arch' am:
45370128a5
am:
c2b36f5696
Change-Id: Id6a10176042b63fcefe8298dae2df4c5ac4c5297
Yifan Hong [Thu, 9 Mar 2017 02:57:48 +0000 (02:57 +0000)]
Merge changes from topic 'vintf_arch'
am:
45370128a5
Change-Id: Ia8e62d1a64e5a893b651c46e5872854e2f52034f
Treehugger Robot [Thu, 9 Mar 2017 02:54:05 +0000 (02:54 +0000)]
Merge changes from topic 'vintf_arch'
* changes:
Update to use bitness info in VINTF.
Fix forEachTable will copy the table.
Mathias Agopian [Thu, 9 Mar 2017 02:28:56 +0000 (02:28 +0000)]
Merge "check that the NativeWindowType is valid in eglCreateWindowSurface"
Fabien Sanglard [Wed, 8 Mar 2017 19:36:46 +0000 (11:36 -0800)]
Create libhwc2on1adapter
Extract the adapter out of SurfaceFlinger library to allow code
behind HAL to use it.
Test: Manual
Change-Id: I415aa2674564eccb2c38f76086807f834177f80f
Yifan Hong [Wed, 8 Mar 2017 22:01:58 +0000 (14:01 -0800)]
Update to use bitness info in VINTF.
Bug:
35966597
Test: lshal -ir has bitness info for passthrough ref section
Test: lshal --init-vintf has bitness info in the manifest.
Change-Id: Ie9f52bb1ca30ce69856dbf44fab8287563014550
Yifan Hong [Wed, 8 Mar 2017 22:01:11 +0000 (14:01 -0800)]
Fix forEachTable will copy the table.
std::initializer_list<T> has T deduced to Table, which will
copy the table. Use pointers instead.
Test: pass
Change-Id: I7da40eb0f5d0171244a9b9caacf37b41fe0af304
TreeHugger Robot [Thu, 9 Mar 2017 00:08:30 +0000 (00:08 +0000)]
Merge "Delete typo in SurfaceFlinger documentation"
TreeHugger Robot [Wed, 8 Mar 2017 23:11:44 +0000 (23:11 +0000)]
Merge "Revert "Remove NativeWindow and unused DVR functions""
TreeHugger Robot [Wed, 8 Mar 2017 23:10:26 +0000 (23:10 +0000)]
Merge "Allow "android" package name."
Mathias Agopian [Wed, 8 Mar 2017 23:02:55 +0000 (15:02 -0800)]
check that the NativeWindowType is valid in eglCreateWindowSurface
This will avoid certain crash (null dereference),
and return an error instead. This is useful for
app developers as java language apps are not
expected to crash when passed bad arguments
This doesn’t fix bug
36065206, but was prompted
by it.
Test: compile / run
Bug:
36065206
Change-Id: I90d25730b3dd292d756b4c38b51320a466fa6d48
Fabien Sanglard [Wed, 8 Mar 2017 22:50:11 +0000 (14:50 -0800)]
Delete typo in SurfaceFlinger documentation
Test: None (this is a comment)
Change-Id: I0876a40697fe5bb5245513520bc1f9a4bf1139f7
Miao Wang [Wed, 8 Mar 2017 22:43:50 +0000 (22:43 +0000)]
Merge "Fix the usage of EIGEN_STATIC_ASSERT_SAME_MATRIX_SIZE"
Okan Arikan [Wed, 8 Mar 2017 22:29:47 +0000 (22:29 +0000)]
Merge "A helper header for matrices."
Jiwen Cai [Wed, 8 Mar 2017 21:23:30 +0000 (21:23 +0000)]
Revert "Remove NativeWindow and unused DVR functions"
This reverts commit
a001af5ae07e156f9c31dcdb24fb7ddead4d9f1e.
Change-Id: Ieb60bc8e8e7caefee30b0fbd13cda15298c32075
Miao Wang [Wed, 8 Mar 2017 20:32:05 +0000 (12:32 -0800)]
Fix the usage of EIGEN_STATIC_ASSERT_SAME_MATRIX_SIZE
- Eigen::internal::traits is not specialized for Eigen::MatrixBase, it
should only be used with the Derived types. Just as Eigen's own tests
do.
Bug:
34161771
Test: mm
Change-Id: I997b26b4a470c4ba851afe6edc5c602ae450c222
Jeff Sharkey [Wed, 8 Mar 2017 19:39:46 +0000 (12:39 -0700)]
Allow "android" package name.
Test: /data/nativetest64/installd_utils_test/installd_utils_test
Bug:
36062649
Change-Id: I9b41a34822a1a194d256f5b99d5955e51716029c
Jiwen Cai [Wed, 8 Mar 2017 18:41:48 +0000 (18:41 +0000)]
Merge "Remove NativeWindow and unused DVR functions"
Kevin Schoedel [Wed, 8 Mar 2017 18:27:15 +0000 (18:27 +0000)]
Merge "Interface for multiple virtual touchpads."
Ganesh Mahendran [Wed, 8 Mar 2017 16:33:00 +0000 (16:33 +0000)]
Merge "libbinder: use sysconf(_SC_PAGESIZE) to get pagesize" am:
b638bf8d3f am:
f83403fdd2
am:
391becb8a7
Change-Id: I11546e02a736bd6c6ece606831462f7ef85c4ec4
Ganesh Mahendran [Wed, 8 Mar 2017 16:30:00 +0000 (16:30 +0000)]
Merge "libbinder: use sysconf(_SC_PAGESIZE) to get pagesize" am:
b638bf8d3f
am:
f83403fdd2
Change-Id: If136ef494a22fb750321272302db7a0d8144eb95
Ganesh Mahendran [Wed, 8 Mar 2017 16:27:30 +0000 (16:27 +0000)]
Merge "libbinder: use sysconf(_SC_PAGESIZE) to get pagesize"
am:
b638bf8d3f
Change-Id: I90088d0769cfe337b2c2c5c308f5fa7e832ca4df
Treehugger Robot [Wed, 8 Mar 2017 16:22:32 +0000 (16:22 +0000)]
Merge "libbinder: use sysconf(_SC_PAGESIZE) to get pagesize"
TreeHugger Robot [Wed, 8 Mar 2017 06:58:42 +0000 (06:58 +0000)]
Merge "Update is_valid_package_name() to match framework."
Jeff Sharkey [Wed, 8 Mar 2017 05:12:03 +0000 (22:12 -0700)]
Update is_valid_package_name() to match framework.
The framework has a new format for /data/app directory names in OC
to protect user privacy. This change updates the validation logic
in installd to support the new format.
For consistency the logic now mirrors the package name validation
logic used by PackageParser.
Test: /data/nativetest64/installd_utils_test/installd_utils_test
Bug:
33705143
Change-Id: I41d270942479c52e063c29a2cb9552d7b238b86e
TreeHugger Robot [Wed, 8 Mar 2017 05:09:10 +0000 (05:09 +0000)]
Merge "Fix enum ordering in sensor NDK"
TreeHugger Robot [Wed, 8 Mar 2017 03:21:16 +0000 (03:21 +0000)]
Merge "Temporarily disable vr_wm visibility while we figure out what triggers it to come up at all time. This is to quickly unblock everyone."
Peng Xu [Wed, 8 Mar 2017 01:49:31 +0000 (17:49 -0800)]
Fix enum ordering in sensor NDK
Test: compiles
Change-Id: Ie186270af2f51d723855cdc62f0b09ffe1ab6ecf
TreeHugger Robot [Wed, 8 Mar 2017 03:12:53 +0000 (03:12 +0000)]
Merge "Sensor direct report with HardwareBuffer channel"
Jiwen 'Steve' Cai [Tue, 7 Mar 2017 22:16:43 +0000 (14:16 -0800)]
Remove NativeWindow and unused DVR functions
1/ Remove the NativeWindow-backed DVR DisplaySurface implementation.
2/ Unused API such as: dvrCreateDisplaySurface and friends are removed.
Bug:
36033302
Test: Built system, ran basicvr, ran particles on Marlin. Also updated
graphics_app_tests to stop testing deprecated API.
Change-Id: I6ea6063c56fabacddcc301bc91567cc1b3f5d67e
TreeHugger Robot [Wed, 8 Mar 2017 02:10:54 +0000 (02:10 +0000)]
Merge "Disable Eigen static assertion for tests/numeric_test.cpp"
Alex Sakhartchouk [Wed, 8 Mar 2017 01:44:56 +0000 (20:44 -0500)]
Temporarily disable vr_wm visibility while we figure out what triggers it
to come up at all time. This is to quickly unblock everyone.
Bug:
36036583
Test: Compiled
Change-Id: Ibf045e7354ee96b7609af1c47b1e64b63659feb9
TreeHugger Robot [Wed, 8 Mar 2017 01:30:59 +0000 (01:30 +0000)]
Merge "Add ASensorEventQueue_registerSensor and default error value"
Miao Wang [Wed, 8 Mar 2017 00:19:06 +0000 (16:19 -0800)]
Disable Eigen static assertion for tests/numeric_test.cpp
- Clang complains with the Eigen static assertions in the tests, after
Eigen 3.3.3 rebase.
- Disable the static assertion until it is fixed in Eigen / Clang.
Bug:
34161771
Test: mm
Change-Id: I25056cf9df9bbb32f979390e02df1f23ac760bab
Okan Arikan [Tue, 7 Mar 2017 19:43:13 +0000 (11:43 -0800)]
A helper header for matrices.
Bug:
34720474
Test: No functional change.
Change-Id: Ibcb8f11feeeadf6f484396d66c0b0cd1ef751f94
(cherry picked from commit
6fff8f0580e352fd81ecd7a0b6b58a6604bcbed7)
TreeHugger Robot [Tue, 7 Mar 2017 23:16:12 +0000 (23:16 +0000)]
Merge "Add MiniFence to drop HWC2on1Adapter libui dep"
Fabien Sanglard [Tue, 7 Mar 2017 22:25:02 +0000 (22:25 +0000)]
Merge "[SurfaceFlinger] Comment SurfaceFlinger HWC2"
Peng Xu [Sun, 5 Mar 2017 09:48:11 +0000 (01:48 -0800)]
Sensor direct report with HardwareBuffer channel
Implement creation of sensor direct channel in sensor
service for sensor direct report feature.
Bug:
30985702
Test: cts-tradefed run cts --module CtsSensorTestCases
--test android.hardware.cts.SensorDirectReportTest
Test: cts-tradefed run cts --module CtsSensorTestCases
--test android.hardware.cts.SensorNativeTest
Change-Id: I52350811df538986cea7f5e1fb336fad53234c86
Peng Xu [Wed, 1 Mar 2017 04:19:47 +0000 (20:19 -0800)]
Add ASensorEventQueue_registerSensor and default error value
ASensorEventQueue_registerSensor is new function created in 2016 but
is never exported at NDK level. In this CL the function signature is
formalized and the function name is added to NDK function export
table. Internal class SensorEventQueue is also changed to adapt.
Default error values are also defined.
Test: cts-tradefed run cts --module CtsSensorTestCases \
--test android.hardware.cts.SensorNativeTest
Change-Id: I74dc72e50ea4bae6d2d8944ce6d2e191ed2f495e
Fabien Sanglard [Tue, 7 Mar 2017 18:10:03 +0000 (10:10 -0800)]
Add MiniFence to drop HWC2on1Adapter libui dep
This class will soon become a library used by devices with no support
for HWC2. They will link against libhwc2on1adapter. Drivers should have
no depedencies on libui.
Test:Manual
Change-Id: Iabd2aa89fc3b737a999632a16c4f6c30464787c4
TreeHugger Robot [Tue, 7 Mar 2017 21:31:01 +0000 (21:31 +0000)]
Merge "split libsensor our of libgui "
Kevin Schoedel [Mon, 6 Mar 2017 19:34:39 +0000 (14:34 -0500)]
Interface for multiple virtual touchpads.
This passes the touchpad selection across binder, but does not yet
actually implement multiple touchpad devices.
Bug: b/
35992608
Test: primary only in VirtualTouchpad_test
Change-Id: I7529735362e0e38805b9c0e52e07b5efc86bd535
Mathias Agopian [Mon, 6 Mar 2017 23:05:04 +0000 (15:05 -0800)]
split libsensor our of libgui
Test: compile & run
Bug: treble cleanup
Change-Id: I5b2c2a14f7d3b364d25695cf0901c5b08cfb0fc9
Calin Juravle [Tue, 7 Mar 2017 19:10:41 +0000 (19:10 +0000)]
Merge "Installd: Clean up code related to foreign dex use" am:
62b34b57c4 am:
9d4819ff2e
am:
9181bdb57f
Change-Id: I2257654b3b73e74a92a179e1068f771e2b6af186
Calin Juravle [Tue, 7 Mar 2017 19:08:10 +0000 (19:08 +0000)]
Merge "Installd: Clean up code related to foreign dex use" am:
62b34b57c4
am:
9d4819ff2e
Change-Id: I21299c36def0a5aa5e202d381abd4ad184c2e7b6
Calin Juravle [Tue, 7 Mar 2017 19:06:10 +0000 (19:06 +0000)]
Merge "Installd: Clean up code related to foreign dex use"
am:
62b34b57c4
Change-Id: Id7beb09ed3d3b79b3b818dd5192b457605f5a54c
Calin Juravle [Tue, 7 Mar 2017 19:00:18 +0000 (19:00 +0000)]
Merge "Installd: Clean up code related to foreign dex use"
TreeHugger Robot [Tue, 7 Mar 2017 17:12:32 +0000 (17:12 +0000)]
Merge "Fix the compiler error for the ternary operator, caused by Eigen rebase."
Courtney Goeltzenleuchter [Tue, 7 Mar 2017 14:48:04 +0000 (14:48 +0000)]
Merge "Disable HDR extension for now"
Ganesh Mahendran [Fri, 3 Mar 2017 01:41:14 +0000 (09:41 +0800)]
libbinder: use sysconf(_SC_PAGESIZE) to get pagesize
pagesize is not always 4KB, use sysconf(_SC_PAGESIZE) to get
real pagesize.
Change-Id: Ib2c82c3a842257601a5c304da3a1f0b07c6ab8c0
Signed-off-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
TreeHugger Robot [Tue, 7 Mar 2017 04:04:40 +0000 (04:04 +0000)]
Merge "InputDevice warning fixes and make warnigs into Error"
Frank Barchard [Mon, 6 Mar 2017 19:17:52 +0000 (11:17 -0800)]
InputDevice warning fixes and make warnigs into Error
use const char * for string literals in InputDevice
Remove unused variable in Keyboard
Bug:
35993509
Test: mm in frameworks/native/libs/input builds without the warning
Change-Id: I11242835eae855386c47e56d6c36e5a2f912a28f
Courtney Goeltzenleuchter [Mon, 6 Mar 2017 23:37:20 +0000 (16:37 -0700)]
Disable HDR extension for now
Test: adb shell vkinfo
Test: Should not see VK_EXT_hdr_metadata in extension list.
bug:
36007564
Change-Id: I96a365d75ddec75856af2fda834d3a4f8368ebb0
Miao Wang [Tue, 7 Mar 2017 01:17:21 +0000 (17:17 -0800)]
Fix the compiler error for the ternary operator, caused by Eigen rebase.
Bug:
34161771
Test: build
Change-Id: I3c0c1b3667a3d1f56052b247c94c6255e9e12004
Fabien Sanglard [Sat, 4 Mar 2017 02:58:50 +0000 (18:58 -0800)]
[SurfaceFlinger] Document layerStack
Test: None, these are only comments.
Change-Id: Id5d45a5847d253bf92263091e5b322a1577fabe1
TreeHugger Robot [Mon, 6 Mar 2017 23:19:36 +0000 (23:19 +0000)]
Merge "Double check hidl service at init + meaningful abort when hidl crash"
TreeHugger Robot [Mon, 6 Mar 2017 23:08:54 +0000 (23:08 +0000)]
Merge "Make the AHardwareBuffer extension compatible with C."
Yifan Hong [Mon, 6 Mar 2017 22:08:26 +0000 (22:08 +0000)]
Merge "lshal: update descriptions in output." am:
074c1cd157 am:
105e9391ac
am:
76ccc8cbd1
Change-Id: Iadb1ea22c087d643d0664919411a3e2408d12fd1
Yifan Hong [Mon, 6 Mar 2017 22:06:25 +0000 (22:06 +0000)]
Merge "lshal: update descriptions in output." am:
074c1cd157
am:
105e9391ac
Change-Id: I9dfa8644300c91bc2149e9f7f4ba5c978b85ecf5
Yifan Hong [Mon, 6 Mar 2017 22:03:56 +0000 (22:03 +0000)]
Merge "lshal: update descriptions in output."
am:
074c1cd157
Change-Id: Iaa60e243566133d1674b2591becdbc9ead403754
Peng Xu [Fri, 3 Mar 2017 03:10:38 +0000 (19:10 -0800)]
Double check hidl service at init + meaningful abort when hidl crash
Sensor hidl service will kill itself when it detects
double-connection(*) from framework sensor service in order to avoid
potential deadlock. This cl adds a no-op call to hidl service at
initialization of framework service to allow early detection on hidl
service side. It also adds retry mechanism in this case to avoid
another system server crash.
Log messages is added when hidl call transport failure to help better
identify problem. There is no sane recovery at this point and fatal
log is preferred.
* Double-connection to hidl service happens when framework sensor
service crash but leave a lingering connection in sensor hidl service.
Auto restarted framework service will attempt to connect hidl service
again which result in a double connection.
Test: manually killing sensor hidl service and/or restart runtime,
with and without sensor service in restricted mode, observe
system recover to good state.
Pid of sensor hidl service can be found by lshal
lshal | grep sensor
switch to restrict mode
dumpsys sensorservice restrict a.non-exist.package
Bug:
35727090
Bug:
35843387
Bug:
35702298
Bug:
35919167
Bug:
35848670
Bug:
35903635
Change-Id: Ie5c24300503e125d9de031a70948e2bda1eb6dc6
Jesse Hall [Mon, 6 Mar 2017 21:47:18 +0000 (21:47 +0000)]
Merge "Fix <vulkan/vulkan.h> compatibility with C."
Pyry Haulos [Mon, 6 Mar 2017 21:35:33 +0000 (21:35 +0000)]
Merge "Whitelist EGL_KHR_no_config_context"
Kevin Schoedel [Mon, 6 Mar 2017 21:21:57 +0000 (21:21 +0000)]
Merge "Provide a library interface to the virtual touchpad service."
Craig Donner [Mon, 6 Mar 2017 20:38:40 +0000 (12:38 -0800)]
Make the AHardwareBuffer extension compatible with C.
The eglext.h file must be C-compatible, and is included by vendor C
code. C does not support magicking up the 'struct' keyword.
Fixes the change made in I0da1173688cd27b8dd9e907e535100b9a0605290
Bug:
34050596
Test: built, ran demo app using extension
Change-Id: Iaa3028c3ae2087f7368549565a778ce75110d3cb
Yifan Hong [Mon, 6 Mar 2017 20:20:18 +0000 (20:20 +0000)]
Merge "lshal: update descriptions in output."
Kevin Schoedel [Fri, 3 Mar 2017 23:11:37 +0000 (18:11 -0500)]
Provide a library interface to the virtual touchpad service.
And make VrWindowManager pay for^H^H^H^H^H^H^H^H use it. The library
interface is a step toward moving 2D embedding into VrCore because it
hides the binder connection that isn't directly accessible to VrCore.
As a matter of implementation, the touchpad-service client library
and the low-level evdev touchpad are derived from the same interface.
Bug: b/
35990873
Test: VirtualTouchpad_test; integration TBD.
Change-Id: Ic922ff223ddd5a44f6fb4433a271f8341e93a0e7
Pyry Haulos [Mon, 6 Mar 2017 17:39:09 +0000 (09:39 -0800)]
Whitelist EGL_KHR_no_config_context
This change allows driver to expose EGL_KHR_no_config_context
functionality.
Test: dEQP-EGL.info.extensions, dEQP-EGL.functional.create_context.no_config
Bug:
22093220
Change-Id: I4dee8577f2fa7378c1f2512cbdc568670d1c036e
Mike Stroyan [Wed, 22 Feb 2017 18:43:09 +0000 (11:43 -0700)]
Use valid libvulkan error results
Several of the error results were not valid according to spec.
Use values that are listed as possible results.
Bug:
35752097
Test: dEQP-VK.wsi.android.incremental_present.*
Change-Id: Ie7830e29b523265d62cd82638af7f6e34a36565b
Jeff Sharkey [Sun, 5 Mar 2017 00:59:17 +0000 (00:59 +0000)]
Merge "Small change for testing." am:
f88834e30d am:
e89136bbe2
am:
f67181001f
Change-Id: I3e86e4996e59266076fa6a0dfcc07a1302b34b9a
Jeff Sharkey [Sun, 5 Mar 2017 00:55:46 +0000 (00:55 +0000)]
Merge "Small change for testing." am:
f88834e30d
am:
e89136bbe2
Change-Id: I489c109cffb55becae53ac957645422c2d9830c9
Jeff Sharkey [Sun, 5 Mar 2017 00:52:16 +0000 (00:52 +0000)]
Merge "Small change for testing."
am:
f88834e30d
Change-Id: I8ca5fd99ae37093e912ab699e976c05d446e2c81
Jeff Sharkey [Sun, 5 Mar 2017 00:48:59 +0000 (00:48 +0000)]
Merge "Small change for testing."
Jeff Sharkey [Sun, 5 Mar 2017 00:48:00 +0000 (17:48 -0700)]
Small change for testing.
Bug:
35970955,
35969439,
35968280
Change-Id: I56c6626221b456e13b1371b69e9c980edaddfa91
Calin Juravle [Sat, 4 Mar 2017 01:00:35 +0000 (17:00 -0800)]
Installd: Clean up code related to foreign dex use
We simplified the way we track whether or not a dex file is used by
other apps. DexManager in the framework keeps track of the data and we
no longer need file markers on disk.
Also, fix the getUserSize by considering the size of the actual profiles
not of the set of empty markers.
Test: device boots, foreign dex markers are not created anymore
Bug:
32871170
Change-Id: I9250e816a1bfa95cb10155e513ae28ebfda7ce4b
Fabien Sanglard [Fri, 3 Mar 2017 22:58:52 +0000 (14:58 -0800)]
[SurfaceFlinger] Comment SurfaceFlinger HWC2
Document decision to clear SurfaceFlinger HWC2 state upon sleep and
awake.
Test: This is just a comment.
Change-Id: I0034d8d79e6e0d5b6287579d23f941e291c89bc0
TreeHugger Robot [Sat, 4 Mar 2017 00:52:43 +0000 (00:52 +0000)]
Merge "fallout of cleaning-up libutils includes"
Mathias Agopian [Wed, 1 Mar 2017 00:25:16 +0000 (16:25 -0800)]
fallout of cleaning-up libutils includes
Test: run & compile
Bug: n/a
Change-Id: I99e462d2db6560742fa3f065d5de50cd60111130
TreeHugger Robot [Fri, 3 Mar 2017 22:13:45 +0000 (22:13 +0000)]
Merge changes I121df86d,Ia692a5fd
* changes:
Add Vulkan to native helpers
Update color space names to match extension
TreeHugger Robot [Fri, 3 Mar 2017 22:12:52 +0000 (22:12 +0000)]
Merge changes from topic 'colorspace_support'
* changes:
Use Surface::GetWideColorSupport in VK_EXT_swapchain_colorspace
Add plumbing for Surface::getHdrSupport
Add plumbing for Surface::getWideColorSupport
TreeHugger Robot [Fri, 3 Mar 2017 22:04:16 +0000 (22:04 +0000)]
Merge "[surfaceflinger] Set blend mode correctly when using HWC2."
TreeHugger Robot [Fri, 3 Mar 2017 21:31:56 +0000 (21:31 +0000)]
Merge "Fix black screen upon awake (reused after free)"
TreeHugger Robot [Fri, 3 Mar 2017 21:10:17 +0000 (21:10 +0000)]
Merge "Delete unused variable in setUpHWComposer"
TreeHugger Robot [Fri, 3 Mar 2017 20:24:41 +0000 (20:24 +0000)]
Merge "Add the missing Parcel.writeInterfaceToken call."
Sudheer Shanka [Thu, 2 Mar 2017 20:27:58 +0000 (12:27 -0800)]
Add the missing Parcel.writeInterfaceToken call.
Bug:
35950090
Test: Verified that it fixes the following error.
Parcel : **** enforceInterface() expected 'android.app.IActivityManager' but read ''
Change-Id: Id70da2d2ba7198e4d5d14aeabe00328c4eb6ef14
Fabien Sanglard [Fri, 3 Mar 2017 19:19:30 +0000 (11:19 -0800)]
Fix black screen upon awake (reused after free)
Under a specific timing, the state of the HWC can be left populated
with "old" layers. If a Refresh Message comes before the WM sends
a Transaction resetting the layer, the old layers are sent to the
HWC. These old layers features buffer_handle which had been freed,
resulting in a frame never signaling and a locked screen due to
backpressure triggering constantly.
Detailed explanation:
When the device power off is pressed, the WM plays the fadeout
animation, set the layer "fadeOut" to displayId -1 and calls
setPowerMode(Off). This sequence of events leads to a state where
no layers are deemed visible in surface flinger but the HWC2 still
has one.
Upon awakening the device, if a Refresh message is received before
the WM has the time to reset fadeOut layer displayId to its original
value, the HWC2 will use its last known state.
Sequence of events (with and without crash):
Put device to sleep.
Awake device.
PowerOn
Refresh <- crash
Put device to sleep.
Awake device.
PowerOn
Transac
Refresh <- Ok
Bug:
35712353
Test: AUPT (100 cycles sleep/awake without black screen lock)
Change-Id: If9177ccc0627f3b733030ed5e462dc465e63e963
Fabien Sanglard [Fri, 3 Mar 2017 19:25:43 +0000 (11:25 -0800)]
Delete unused variable in setUpHWComposer
Test: AUPT and Manual
Change-Id: I53fbd7f9fa83b8729554a021be526a5fb71e2b13