OSDN Git Service
John Reck [Fri, 23 Jun 2017 19:08:31 +0000 (19:08 +0000)]
Disable setting saved_cmdline_size am:
ba54d5baf4
am:
acc79d7cfe
Change-Id: I8be566b029a6ec93334e7a4dd37eec12846b1f60
John Reck [Fri, 23 Jun 2017 19:04:01 +0000 (19:04 +0000)]
Disable setting saved_cmdline_size am:
ba54d5baf4
am:
64dac11cc0
Change-Id: I293be9ed5486024c479a0ef133086f825e259048
John Reck [Fri, 23 Jun 2017 19:02:13 +0000 (19:02 +0000)]
Disable setting saved_cmdline_size
am:
ba54d5baf4
Change-Id: Icd17c5257c03fd9e33114c5760ece6c21c74d025
John Reck [Fri, 23 Jun 2017 19:00:44 +0000 (19:00 +0000)]
Disable setting saved_cmdline_size
am:
ba54d5baf4
Change-Id: I447ad42ad4c245013e488701a61d8ce2348a368d
John Reck [Fri, 23 Jun 2017 16:44:08 +0000 (09:44 -0700)]
Disable setting saved_cmdline_size
Minimal revert of the addition of increasing
the saved_cmdline_size. This change
exposed kernel bugs that prevented
atrace from working.
Bug:
62375794
Test: manual
Change-Id: Ie946b9246ce9ba22af59dbf0b9fe8a59a5fa1f3f
Courtney Goeltzenleuchter [Fri, 23 Jun 2017 02:40:16 +0000 (02:40 +0000)]
EGL: add color space validation
am:
15f79786e1
Change-Id: I05600bda5553b6e5f49a055f30cfef60db4fa9e8
Courtney Goeltzenleuchter [Tue, 20 Jun 2017 14:12:54 +0000 (08:12 -0600)]
EGL: add color space validation
We want Android to support multiple color spaces as
that can be implemented entirely in the eglapi.cpp wrapper.
These additional dataspaces do not require special behavior
by the driver and may not recognize EGL_GL_COLORSPACE_DISPLAY_P3_EXT,
EGL_GL_COLORSPACE_DISPLAY_P3_LINEAR_EXT, and related attributes.
Therefor, need to filter out those attributes before calling
the driver.
In the future there may be new extensions that do require
driver support. When that happens we'll need to update
stripColorSpaceAttribute to treat that correctly.
Test: Android CTS
adb -d shell am start \
-n com.drawelements.deqp/android.app.NativeActivity \
-e cmdLine '"deqp --deqp-case=dEQP-EGL.functional.wide_color.* \
--deqp-log-filename=/sdcard/dEQP-Log.qpa"'
Bug:
62424735
Change-Id: I0f0867feb73055100636d326213183ef1f052b7c
(cherry picked from commit
eeaa52bc65b5cfaca1f0de44635b57919179df29)
Chia-I Wu [Thu, 22 Jun 2017 20:47:38 +0000 (20:47 +0000)]
Merge "surfaceflinger: discard stale commands" into oc-dev am:
f8ca9a0875
am:
3addef29f7
Change-Id: Ica0906d38bbf2df75f10a6108600c3c1646ab80d
Fabien Sanglard [Thu, 22 Jun 2017 20:47:14 +0000 (20:47 +0000)]
Merge "LibGUI remove DEBUG" into oc-dev am:
be597daebd
am:
45bf98c36e
Change-Id: Ic223a6dfb10324fbdd2b2609072a0088eff4fbd9
Fabien Sanglard [Thu, 22 Jun 2017 20:46:48 +0000 (20:46 +0000)]
Disable skip Validate on client composition am:
269c236109
am:
0ff681ca77
Change-Id: I7331077ef129e55aed38f10f19732a22eb842bd6
Chia-I Wu [Thu, 22 Jun 2017 20:15:00 +0000 (20:15 +0000)]
Merge "surfaceflinger: discard stale commands" into oc-dev am:
f8ca9a0875
am:
49cdc635a2
Change-Id: I84da842894b25f11b665bd3b4adf597b3aee94ef
Fabien Sanglard [Thu, 22 Jun 2017 20:14:32 +0000 (20:14 +0000)]
Merge "LibGUI remove DEBUG" into oc-dev am:
be597daebd
am:
d9517fe958
Change-Id: Id677c4ba2c28922c4a3f64fdc2b114d3e3031dbd
Fabien Sanglard [Thu, 22 Jun 2017 20:14:10 +0000 (20:14 +0000)]
Disable skip Validate on client composition am:
269c236109
am:
89283e56d6
Change-Id: Id8e05d219ef73616cdef7152008b487050f25373
Chia-I Wu [Thu, 22 Jun 2017 20:07:16 +0000 (20:07 +0000)]
Merge "surfaceflinger: discard stale commands" into oc-dev
am:
f8ca9a0875
Change-Id: I6b7ce1798d2fe753c577ff3baa954283c372b80c
Fabien Sanglard [Thu, 22 Jun 2017 20:06:51 +0000 (20:06 +0000)]
Merge "LibGUI remove DEBUG" into oc-dev
am:
be597daebd
Change-Id: Iece9f1428655c8674cf62a92ecb0a088ad74b629
Fabien Sanglard [Thu, 22 Jun 2017 20:06:31 +0000 (20:06 +0000)]
Disable skip Validate on client composition
am:
269c236109
Change-Id: I4c0a4a90ff0ca2e39075ad643d1892597301d3fd
Chia-I Wu [Thu, 22 Jun 2017 20:04:12 +0000 (20:04 +0000)]
Merge "surfaceflinger: discard stale commands" into oc-dev
am:
f8ca9a0875
Change-Id: Ief69f6fcf0c738612b14b94d65b3ae1555973d6c
Fabien Sanglard [Thu, 22 Jun 2017 20:03:13 +0000 (20:03 +0000)]
Merge "LibGUI remove DEBUG" into oc-dev
am:
be597daebd
Change-Id: I65756ce89b4a10d2df403f9f9a4ce2cacdaafda0
Fabien Sanglard [Thu, 22 Jun 2017 20:02:43 +0000 (20:02 +0000)]
Disable skip Validate on client composition
am:
269c236109
Change-Id: Ib0d2f8a9e59cf4618ed029fe35391f566d11bcfb
Chia-I Wu [Thu, 22 Jun 2017 19:59:35 +0000 (19:59 +0000)]
Merge "surfaceflinger: discard stale commands" into oc-dev
Fabien Sanglard [Thu, 22 Jun 2017 19:56:29 +0000 (19:56 +0000)]
Merge "LibGUI remove DEBUG" into oc-dev
Fabien Sanglard [Thu, 22 Jun 2017 18:35:16 +0000 (11:35 -0700)]
Disable skip Validate on client composition
SurfaceFlinger should not skip validate when GLComposition is
needed. This can happen when SF decides to force GLComposition
(like when a screen rotation occurs).
Bug:
62906801
Test: Manual
Change-Id: I248146eade395a124cb149773287abd88ae36511
Chia-I Wu [Thu, 22 Jun 2017 17:48:28 +0000 (10:48 -0700)]
surfaceflinger: discard stale commands
When we skip validate, we may have stale commands on the command
buffer. They should be discarded.
Bug:
62906801
Test: manual
Change-Id: Ie7921ba75ab2252b834cda6924e1fcfdf236f759
Fabien Sanglard [Thu, 22 Jun 2017 18:13:49 +0000 (11:13 -0700)]
LibGUI remove DEBUG
DEBUG_ONLY_CODE flag enables expensive checks such as
BufferQueueCore::validateConsistencyLocked() which when running
represents 15.1% of SurfaceFlinger total runtime. Enabling these
check for "eng" build only make "userdebug" build closer to "user".
Test: Manual
Bug:
62905241
Change-Id: I77065ecf4e62261c3f02b1cad9966d5c4845c639
Android Build Merger (Role) [Thu, 22 Jun 2017 06:02:10 +0000 (06:02 +0000)]
Merge "Skip Validate am:
249c0ae80a am:
9837ce8210" into oc-dr1-dev-plus-aosp
Fabien Sanglard [Thu, 22 Jun 2017 06:01:34 +0000 (06:01 +0000)]
Skip Validate am:
249c0ae80a
am:
9837ce8210
Change-Id: If81e98cd140426c5cc33595205fd9d4c26bef044
Fabien Sanglard [Thu, 22 Jun 2017 06:01:00 +0000 (06:01 +0000)]
Skip Validate am:
249c0ae80a
am:
8976c6ae37
Change-Id: I400dfd8d484779e5523353b002164f4f5ea41e03
Fabien Sanglard [Thu, 22 Jun 2017 05:58:06 +0000 (05:58 +0000)]
Skip Validate
am:
249c0ae80a
Change-Id: I336fce473d21e5fdfb80ad8eb48f1df5a24497d8
Fabien Sanglard [Thu, 22 Jun 2017 05:57:15 +0000 (05:57 +0000)]
Skip Validate
am:
249c0ae80a
Change-Id: I55a564d600a422915f43111f4e02a10857512fcf
Fabien Sanglard [Tue, 20 Jun 2017 02:22:36 +0000 (19:22 -0700)]
Skip Validate
b/
37474580
b/
62806392
Test: marlin, ryu
Change-Id: I09e0c52cb7c914dcd883dc771d97a365c89f7037
Jibu Joseph [Thu, 22 Jun 2017 04:41:37 +0000 (04:41 +0000)]
Merge "Update dumpstate binary file name" into oc-dr1-dev
am:
8d897e6003
Change-Id: Idfd13cc794eb170c16d203f7f8b78077ac37db80
Jibu Joseph [Thu, 22 Jun 2017 04:36:00 +0000 (04:36 +0000)]
Merge "Update dumpstate binary file name" into oc-dr1-dev
Jiyong Park [Wed, 21 Jun 2017 21:40:07 +0000 (21:40 +0000)]
Merge changes from topic 'vendor_available_libgui' into oc-dr1-dev
am:
8c72947af1
Change-Id: Ie7315f7aea25663576402d04a58bbeaa9662e3c4
TreeHugger Robot [Wed, 21 Jun 2017 21:35:59 +0000 (21:35 +0000)]
Merge changes from topic 'vendor_available_libgui' into oc-dr1-dev
* changes:
Make libgui available to vendors
Mark EGL/GLES libs as vendor_available
Change export_include_dirs into export_header_lib_headers
Peng Xu [Wed, 21 Jun 2017 20:48:00 +0000 (20:48 +0000)]
Merge "Check key before edit value in countFlushCompleteEventsLocked" into oc-dr1-dev
am:
8669acc97d
Change-Id: I5fa61c3ffa5f41a5093dba86ad255687d29466b4
TreeHugger Robot [Wed, 21 Jun 2017 20:42:24 +0000 (20:42 +0000)]
Merge "Check key before edit value in countFlushCompleteEventsLocked" into oc-dr1-dev
Jie Song [Wed, 21 Jun 2017 20:26:00 +0000 (13:26 -0700)]
Update dumpstate binary file name
Keep modem_log_all.tar for a while for vendors
Bug:
62865279
Test: Verify file name in bugreport
Change-Id: Ia64f6c8e978877040eecfbc6066f0d741d91ddf3
Santos Cordon [Wed, 21 Jun 2017 17:59:47 +0000 (17:59 +0000)]
Merge "Add DVR method to get native display metrics" into oc-dr1-dev
am:
f412b2b9fc
Change-Id: I4cfecf4ccc8bd5a8c3b9c3c11d885ac0233b71d3
Santos Cordon [Wed, 21 Jun 2017 17:53:06 +0000 (17:53 +0000)]
Merge "Add DVR method to get native display metrics" into oc-dr1-dev
Martijn Coenen [Wed, 21 Jun 2017 13:59:29 +0000 (13:59 +0000)]
Merge "Avoid SELinux violation at vndservicemanager" into oc-dr1-dev
am:
5e6abb3f0a
Change-Id: Id757814f2d04cdbbe66f5dcc30fcf34f14338aa2
Martijn Coenen [Wed, 21 Jun 2017 13:55:22 +0000 (13:55 +0000)]
Merge "Avoid SELinux violation at vndservicemanager" into oc-dr1-dev
Jiyong Park [Wed, 21 Jun 2017 03:14:18 +0000 (12:14 +0900)]
Make libgui available to vendors
libgui is now available to vendors, especially for BufferQueue in
between the OMX and Camera HALs for encoding the captured video stream.
In doing so, its headers were moved from frameworks/native/include to
its local directory frameworks/native/libs/gui/include. This is required
because global include path is not supported when building for vendor.
However, in order not to affect platform modules that are still relying
on the global include path, symlinks are provided.
frameworks/native/include/gui -> frameworks/native/libs/include/gui
frameworks/native/include/private/gui ->
frameworks/native/libs/include/private/gui
Bug:
37731063
Test: BOARD_VNDK_VERSION=current m -j libgui.vendor
Change-Id: I0bab8d2e31959085ad58b1ce4c610334ee3da033
Jiyong Park [Wed, 21 Jun 2017 03:26:51 +0000 (12:26 +0900)]
Mark EGL/GLES libs as vendor_available
EGL/GLES libs are marked as vendor_available, otherwise vendors are not
able to use OpenGL. The libs were not simply declared as LL-NDK because
doing so causes the dual loading of libui.so in vendor processes;
platform version of libui.so is loaded since it is depended by libEGL.so
whereas there also is vendor version of libui.so in /system/lib/vndk.
When libEGL.so is built for vendors, 1) libgraphicsenv is removed from
its dependency list as the lib must not be available to vendors and 2)
eglGetNativeClientBufferANDROID is unusable since the function relies on
AHardwareBuffer_to_ANativeWindowBuffer which isn't available to vendor.
Bug:
37731063
Test: BOARD_VNDK_VERSION=current m -j libEGL.vendor
Test: BOARD_VNDK_VERSION=current m -j libGLESv2.vendor
Change-Id: I83a128b14a5d852bb0f2cd821a8e3f82c66a313f
Jiyong Park [Tue, 20 Jun 2017 04:51:22 +0000 (13:51 +0900)]
Change export_include_dirs into export_header_lib_headers
Remove the duplicated information that headers for libbinder is in the
'include' dir.
Test: m -j
Change-Id: I5527c2709ff9d3a996c619f973345e61407cd3f0
Jie Song [Wed, 21 Jun 2017 01:55:56 +0000 (01:55 +0000)]
dumpstate: Add the 2nd fd for binary file
am:
9fbfad0b6d
Change-Id: I6c8111188e7fdb8b4b6282aa3511a4d7187cd69e
Jiyong Park [Wed, 21 Jun 2017 00:50:46 +0000 (00:50 +0000)]
Merge "Move include/binder to libs/binder/include" am:
d46d9f1243 am:
b212140bbf -s ours
am:
7f683a8b8f -s ours
Change-Id: I0a02efc1cac647857ba32235fac2c160d7dcb8db
Jiyong Park [Wed, 21 Jun 2017 00:44:55 +0000 (00:44 +0000)]
Merge "Move include/binder to libs/binder/include" am:
d46d9f1243
am:
b212140bbf -s ours
Change-Id: If344d9c14b3cf767956d55e0dd5d13b5a700c7a4
Jiyong Park [Wed, 21 Jun 2017 00:40:25 +0000 (00:40 +0000)]
Merge "Move include/binder to libs/binder/include"
am:
d46d9f1243
Change-Id: I41744e18ca3731b3027cb459b97945270a4d94ef
Treehugger Robot [Wed, 21 Jun 2017 00:27:49 +0000 (00:27 +0000)]
Merge "Move include/binder to libs/binder/include"
Jie Song [Tue, 20 Jun 2017 23:29:42 +0000 (16:29 -0700)]
dumpstate: Add the 2nd fd for binary file
Bug:
33820081
Test: Verify binary file is added in bugreport
Change-Id: Ibe1c219ca4bf288adcb76996c6178426a4d04333
Kouji Shiotani [Tue, 13 Jun 2017 06:40:54 +0000 (15:40 +0900)]
Avoid SELinux violation at vndservicemanager
Avoid following SELinux violation.
avc: denied { read } for comm="vndservicemanag"
name="nonplat_service_contexts" dev="rootfs" ino=17045
scontext=u:r:vndservicemanager:s0
tcontext=u:object_r:service_contexts_file:s0 tclass=file permissive=0
ppid=1 pcomm="init" pgid=1 pgcomm="init"
This violation caused by vndservicemanager reading service_contexts at
svcmgr_handler(). In main() loading as well, processing is divided by
the VENDORSERVICEMANAGER flag. Therefore, even in svcmgr_handler(),
processing is divided by flags like main().
Bug:
62562415
Test: mma
Change-Id: I06b0308a80fc6ea1ca57cd10d9555dd269b8e12d
Android Build Merger (Role) [Tue, 20 Jun 2017 20:33:20 +0000 (20:33 +0000)]
Merge "Merge "surfaceflinger: fix a potential child layer leak" into oc-dev am:
1b02b6329e am:
989ed5c4c1" into oc-dr1-dev-plus-aosp
Chia-I Wu [Tue, 20 Jun 2017 20:32:59 +0000 (20:32 +0000)]
Merge "surfaceflinger: fix a potential child layer leak" into oc-dev am:
1b02b6329e
am:
989ed5c4c1
Change-Id: I1255ff4ef6234b61996e6f7c8dfb86c890e4268e
Chia-I Wu [Tue, 20 Jun 2017 20:32:58 +0000 (20:32 +0000)]
Merge "surfaceflinger: fix a potential child layer leak" into oc-dev am:
1b02b6329e
am:
4d5cc90559
Change-Id: Ib956b914044fee1941ef966bbf96c151bbbcf6a4
Chia-I Wu [Tue, 20 Jun 2017 20:28:58 +0000 (20:28 +0000)]
Merge "surfaceflinger: fix a potential child layer leak" into oc-dev
am:
1b02b6329e
Change-Id: I3548aaa0a071f5b1009c5b1070405a09d7841095
Chia-I Wu [Tue, 20 Jun 2017 20:28:58 +0000 (20:28 +0000)]
Merge "surfaceflinger: fix a potential child layer leak" into oc-dev
am:
1b02b6329e
Change-Id: Ie2bd5a6d1d37bb5b7c7b679b8c472389ff619188
TreeHugger Robot [Tue, 20 Jun 2017 20:15:29 +0000 (20:15 +0000)]
Merge "surfaceflinger: fix a potential child layer leak" into oc-dev
Peng Xu [Tue, 20 Jun 2017 19:41:33 +0000 (12:41 -0700)]
Check key before edit value in countFlushCompleteEventsLocked
Fix an unchecked editValueFor that potentially causes log fatal
when sensor is removed from connection shortly before arrival of
flush complete message.
Bug:
62806749
Test: compiles, flush() still working.
Change-Id: I3684251b7bb746b01d0d8849024217c80ad52f9d
Stephen Kiazyk [Fri, 9 Jun 2017 21:26:31 +0000 (14:26 -0700)]
Add DVR method to get native display metrics
This seems like the kind of infomration we should be able to communicate
to vrcore.
Bug:
62494565
Test: Builds and loads, still need to test with vrcore
Change-Id: I2342fabcd2bcb8a34c0b783391b60defc381f3c6
(cherry picked from commit
6c5a92f142b5fa1907ff91a7dce4d09ddcb554c6)
Yifan Hong [Tue, 20 Jun 2017 04:58:16 +0000 (04:58 +0000)]
Merge "Fix minor version bump reflected in lshal --init-vintf" am:
ac6575097d am:
99065302ed
am:
cf64ff00ea -s ours
Change-Id: I9811de0500a5d5172744c962549524416c3183e3
Yifan Hong [Tue, 20 Jun 2017 04:52:23 +0000 (04:52 +0000)]
Merge "Fix minor version bump reflected in lshal --init-vintf" am:
ac6575097d
am:
99065302ed
Change-Id: Ic2a1f895312dee90e9e0eaf691edb48df4897c4e
Yifan Hong [Tue, 20 Jun 2017 01:10:56 +0000 (01:10 +0000)]
Merge "Fix minor version bump reflected in lshal --init-vintf"
am:
ac6575097d
Change-Id: I05dafdba2c7f302dc6200bd2d274e30a33f77de7
Treehugger Robot [Tue, 20 Jun 2017 01:06:52 +0000 (01:06 +0000)]
Merge "Fix minor version bump reflected in lshal --init-vintf"
Yifan Hong [Tue, 20 Jun 2017 01:02:46 +0000 (01:02 +0000)]
Fix minor version bump reflected in lshal --init-vintf
am:
e86f70b474
Change-Id: Id573ba5c3b436249a5f407e575a01a61e7985e62
Yifan Hong [Mon, 19 Jun 2017 23:23:24 +0000 (23:23 +0000)]
Merge "Fix incorrect bitness for lshal --init-vintf" am:
e162a97703 am:
126eee4d14
am:
c77bc022f7 -s ours
Change-Id: I69a55e1df55604c5ec36a93fbd070fe333e01cc1
Yifan Hong [Mon, 19 Jun 2017 23:08:15 +0000 (23:08 +0000)]
Merge "Fix incorrect bitness for lshal --init-vintf" am:
e162a97703
am:
126eee4d14
Change-Id: I435466a45aa5217f99c73007d5f07c1754216995
Yifan Hong [Mon, 19 Jun 2017 23:02:08 +0000 (23:02 +0000)]
Merge "Fix incorrect bitness for lshal --init-vintf"
am:
e162a97703
Change-Id: Ib59a256b4491b2bf93e8eca1fa85d9a193719446
Treehugger Robot [Mon, 19 Jun 2017 22:51:52 +0000 (22:51 +0000)]
Merge "Fix incorrect bitness for lshal --init-vintf"
Yifan Hong [Mon, 19 Jun 2017 22:47:39 +0000 (15:47 -0700)]
Fix minor version bump reflected in lshal --init-vintf
Test: lshal --init-vintf has no warnings, and power@1.1 / vibrator@1.1
is shown in output.
Bug:
62675393
Change-Id: I1ffd8b6dc7fcadcf7228cf2b8838e918bb3afe6b
Merged-In: I1ffd8b6dc7fcadcf7228cf2b8838e918bb3afe6b
Yifan Hong [Mon, 19 Jun 2017 22:47:39 +0000 (15:47 -0700)]
Fix minor version bump reflected in lshal --init-vintf
Test: lshal --init-vintf has no warnings, and power@1.1 / vibrator@1.1
is shown in output.
Bug:
62675393
Change-Id: I1ffd8b6dc7fcadcf7228cf2b8838e918bb3afe6b
Merged-In: I1ffd8b6dc7fcadcf7228cf2b8838e918bb3afe6b
Yifan Hong [Mon, 19 Jun 2017 21:36:03 +0000 (21:36 +0000)]
Merge "Fix incorrect bitness for lshal --init-vintf" into oc-dr1-dev
am:
5cf813eef0
Change-Id: I1267c96addf4c501fd695faddf5e4d59bd51f8a0
TreeHugger Robot [Mon, 19 Jun 2017 21:27:01 +0000 (21:27 +0000)]
Merge "Fix incorrect bitness for lshal --init-vintf" into oc-dr1-dev
Yifan Hong [Mon, 19 Jun 2017 19:27:08 +0000 (12:27 -0700)]
Fix incorrect bitness for lshal --init-vintf
Test: lshal --init-vintf, graphics.mapper has 32+64.
Change-Id: Ic586c8333064cc5636679ce8ad4e1231307191f4
Merged-In: Ic586c8333064cc5636679ce8ad4e1231307191f4
Fixes:
62675393
Yifan Hong [Mon, 19 Jun 2017 19:27:08 +0000 (12:27 -0700)]
Fix incorrect bitness for lshal --init-vintf
Test: lshal --init-vintf, graphics.mapper has 32+64.
Change-Id: Ic586c8333064cc5636679ce8ad4e1231307191f4
Merged-In: Ic586c8333064cc5636679ce8ad4e1231307191f4
Fixes:
62675393
Android Build Merger (Role) [Sat, 17 Jun 2017 02:01:09 +0000 (02:01 +0000)]
Merge "Merge changes from topic 'layer-wp-race' into oc-dev am:
a17b14eb92 am:
c35a5e29f3" into oc-dr1-dev-plus-aosp
Chia-I Wu [Sat, 17 Jun 2017 02:01:00 +0000 (02:01 +0000)]
Merge changes from topic 'layer-wp-race' into oc-dev am:
a17b14eb92
am:
c35a5e29f3
Change-Id: I590c8667049be99f407972953c41ff88e555bb2a
Chia-I Wu [Sat, 17 Jun 2017 02:00:50 +0000 (02:00 +0000)]
Merge changes from topic 'layer-wp-race' into oc-dev am:
a17b14eb92
am:
f39c08c906
Change-Id: I579504e93cc6c21dd13e5b8468d8b87037133a0c
Chia-I Wu [Sat, 17 Jun 2017 01:58:33 +0000 (01:58 +0000)]
Merge changes from topic 'layer-wp-race' into oc-dev
am:
a17b14eb92
Change-Id: I1af51f57255024d36e9cae5c221361f36cb28da4
Chia-I Wu [Sat, 17 Jun 2017 01:58:31 +0000 (01:58 +0000)]
Merge changes from topic 'layer-wp-race' into oc-dev
am:
a17b14eb92
Change-Id: I2fb898abae8b4602aa7257b45293f582f0641f24
TreeHugger Robot [Sat, 17 Jun 2017 01:51:06 +0000 (01:51 +0000)]
Merge changes from topic 'layer-wp-race' into oc-dev
* changes:
surfaceflinger: Layer::getParent requires state lock held
surfaceflinger: distinguish mCurrentParent/mDrawingParent
surfaceflinger: protect Client::mParentLayer with a lock
Android Build Merger (Role) [Fri, 16 Jun 2017 23:34:58 +0000 (23:34 +0000)]
Merge "Add method to explicitly create Surface. am:
4e623e259c am:
84051d9c97" into oc-dr1-dev-plus-aosp
Bryce Lee [Fri, 16 Jun 2017 23:33:15 +0000 (23:33 +0000)]
Add method to explicitly create Surface. am:
4e623e259c
am:
84051d9c97
Change-Id: I4368e31fdb9b7ec0912bddbe75399c7d778383b8
Bryce Lee [Fri, 16 Jun 2017 23:33:12 +0000 (23:33 +0000)]
Add method to explicitly create Surface. am:
4e623e259c
am:
05e6335833
Change-Id: Id470d62303b9055522d1cb6ad456bcbe4d320cfd
Chia-I Wu [Thu, 15 Jun 2017 19:53:59 +0000 (12:53 -0700)]
surfaceflinger: fix a potential child layer leak
We should not remove a child layer from its already removed parent.
Call p->removeChild only after we've checked that the ancestor is
alive.
Apply
e6b63e1ae12692327f7e46d5f10d6ade5a7bf192 and this fix to
SurfaceFlinger_hwc1.cpp as well.
Bug:
37121786
Test: manual stress test
Change-Id: I7b811450a998acc4ad9690bd4eda058ce6588e14
Chia-I Wu [Thu, 15 Jun 2017 19:53:59 +0000 (12:53 -0700)]
surfaceflinger: Layer::getParent requires state lock held
We rely on mStateLock to synchronize accesses to
Layer::mCurrentParent.
Bug:
38505866
Test: manual stress test
Change-Id: I5f8ec358ed7e35df28f8c6aec31ae6ee51cb5b93
Bryce Lee [Fri, 16 Jun 2017 23:24:47 +0000 (23:24 +0000)]
Add method to explicitly create Surface.
am:
4e623e259c
Change-Id: I22ff0cd39e80478a74e4589084d5ccabfbe54443
Bryce Lee [Fri, 16 Jun 2017 23:24:46 +0000 (23:24 +0000)]
Add method to explicitly create Surface.
am:
4e623e259c
Change-Id: Ie3755008a75dc67f1d01a0a5fc8bf4e953c8cf9d
Jesse Hall [Fri, 16 Jun 2017 22:53:34 +0000 (22:53 +0000)]
Merge "libui: Load a.h.graphics.mapper passthrough service on library load" into oc-dr1-dev
am:
90254a8d57
Change-Id: I4e1b88ca22dc7ca4bb1be792f17b03cad5e75f10
Jesse Hall [Fri, 16 Jun 2017 22:45:37 +0000 (22:45 +0000)]
Merge "libui: Load a.h.graphics.mapper passthrough service on library load" into oc-dr1-dev
Kevin Schoedel [Fri, 16 Jun 2017 21:04:13 +0000 (21:04 +0000)]
Merge "Fix virtual touchpad scroll events." into oc-dr1-dev
am:
23970309e2
Change-Id: I89257f0a2b434016601aac06a9ed8cbbf5be1bd1
Kevin Schoedel [Fri, 16 Jun 2017 20:56:33 +0000 (20:56 +0000)]
Merge "Fix virtual touchpad scroll events." into oc-dr1-dev
Bryce Lee [Fri, 16 Jun 2017 14:06:17 +0000 (07:06 -0700)]
Add method to explicitly create Surface.
It is sometimes necessary for a SurfaceControl client to request the
associated Surface object be created rather than reuse the cached
value. This changelist adds an additional method that performs the
same creation operations as if the Surface object was created for the
first time.
Bug:
62108743
Test: go/wm-smoke
Change-Id: I2f460f20b2d16ed9ff81cb36842bcd2f8641e03c
Chia-I Wu [Tue, 13 Jun 2017 21:10:56 +0000 (14:10 -0700)]
surfaceflinger: distinguish mCurrentParent/mDrawingParent
Updates to wp<> is not atomic. We cannot use/update it at the same
time from the main thread and a binder thread. With this change,
binder threads use mCurrentParent with the external state lock held.
The main thread uses mDrawingParent.
This is also an alternative fix to bug
62099658 and allows us to
revert "SurfaceFlinger: Update parent pointer while performing
transaction."
Bug:
38505866
Bug:
62099658
Test: boots and no repro (but I can never repro)
Change-Id: Id286a437537daaeec5eee5de62b1d9df245ece53
Chia-I Wu [Thu, 15 Jun 2017 21:01:18 +0000 (14:01 -0700)]
surfaceflinger: protect Client::mParentLayer with a lock
Updates to wp<> is not atomic. Use Client::mLock to protect
mParentLayer.
Bug:
38505866
Test: camera and youtube work
Change-Id: I2739382d5bb99961a47c1011963b6f676d34eec6
Kevin Schoedel [Thu, 15 Jun 2017 15:21:13 +0000 (11:21 -0400)]
Fix virtual touchpad scroll events.
1. Correctly configure the uinput device to pass REL_*WHEEL events.
2. Configure the virtual touchpad as a 'rotary encoder', which is
an inputflinger device class originally provided for the G1 scroll
ball. This provides two advantages over the default mouse-wheel
interpretation:
- It works without an associated mouse pointer to determine the
event target.
- It allows for higher resolution through a scale factor (the
scaling here is chosen by experiment to feel no worse than wheel
mode, but might benefit from future adjustment).
There is one accompanying disadvantage: inputflinger only handles
vertical scrolling (REL_WHEEL) and ignores the horizontal axis
(REL_HWHEEL).
Bug:
62632827
Test: manual on sailfish
Change-Id: Ic8edad01796d75e8c94fa20f05a5badb0727a948
Stephen Kiazyk [Fri, 16 Jun 2017 16:20:59 +0000 (16:20 +0000)]
Set the vr hwc vsync rate to match the native vsync
am:
22c1462add
Change-Id: I3b4ebea0ad9e8249d6dec76e798e67724a84761d
Jiyong Park [Fri, 16 Jun 2017 06:16:33 +0000 (15:16 +0900)]
Move include/binder to libs/binder/include
Also moved include/private/binder to libs/binder/include/private/binder.
This allows libbinder to be compiled without depending on global
headers.
Bug:
33241851
Test: Build, flash, and run sailfish.
Test: Try building with BOARD_VNDK_VERSION := current
Change-Id: I266d5338677a92dd0563b311a479e7ad27bbaf55
Merged-In: I0a82b733353add589de26eb2db7af5a246e5c97f
Jesse Hall [Wed, 7 Jun 2017 21:44:46 +0000 (14:44 -0700)]
libui: Load a.h.graphics.mapper passthrough service on library load
Zygote loads libui, this helps complete the chain from
zygote -> libui -> a.h.graphics.mapper -> gralloc
so that all of these libraries which are used by nearly every app are
loaded by zygote and shared.
Bug:
62353585
Test: boot to launcher, run calculator, confirm a.h.graphics.mapper
implementation library is in /proc/`pid zygote64`/maps
Change-Id: Ib505c926a410191e3e2ad809bfe98a73b21fac90
Stephen Kiazyk [Thu, 15 Jun 2017 22:53:59 +0000 (15:53 -0700)]
Set the vr hwc vsync rate to match the native vsync
This simple modification reduces the motopho latency from 85ms to 65ms.
However, this is not a final solution, and we should continue to look
for how to address the issue of difference in vsync reporting.
Bug:
36493906
Test: Run motopho, latency is now much lower.
Change-Id: Id52689900a5fe58dfc9d7790b7c3746903380972
Steven Thomas [Thu, 15 Jun 2017 21:45:05 +0000 (21:45 +0000)]
Merge "Fix vr flinger post thread to resume correctly" into oc-dr1-dev
am:
4bfb7550af
Change-Id: I2957b1b32bf8378f4b965d1f60dcafd4c48f938e