OSDN Git Service

android-x86/frameworks-native.git
7 years agoDisable setting saved_cmdline_size am: ba54d5baf4 am: acc79d7cfe
John Reck [Fri, 23 Jun 2017 19:13:34 +0000 (19:13 +0000)]
Disable setting saved_cmdline_size am: ba54d5baf4 am: acc79d7cfe
am: 085368a92a

Change-Id: Ica471df4a011bc3afb8b164dc16288c1bd7f26c2

7 years agoDisable setting saved_cmdline_size am: ba54d5baf4 am: 64dac11cc0
John Reck [Fri, 23 Jun 2017 19:08:32 +0000 (19:08 +0000)]
Disable setting saved_cmdline_size am: ba54d5baf4 am: 64dac11cc0
am: 4e0d0cba5c

Change-Id: I99df51ff5c01bc7d4adf5945e597f79e7c70988d

7 years agoDisable setting saved_cmdline_size am: ba54d5baf4
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

7 years agoDisable setting saved_cmdline_size am: ba54d5baf4
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

7 years agoDisable setting saved_cmdline_size
John Reck [Fri, 23 Jun 2017 19:02:13 +0000 (19:02 +0000)]
Disable setting saved_cmdline_size
am: ba54d5baf4

Change-Id: Icd17c5257c03fd9e33114c5760ece6c21c74d025

7 years agoDisable setting saved_cmdline_size
John Reck [Fri, 23 Jun 2017 19:00:44 +0000 (19:00 +0000)]
Disable setting saved_cmdline_size
am: ba54d5baf4

Change-Id: I447ad42ad4c245013e488701a61d8ce2348a368d

7 years agoDisable setting saved_cmdline_size
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

7 years agoEGL: add color space validation am: 15f79786e1
Courtney Goeltzenleuchter [Fri, 23 Jun 2017 02:44:47 +0000 (02:44 +0000)]
EGL: add color space validation am: 15f79786e1
am: e175679b61

Change-Id: I447740c95434f84979a5d42faafd8f030e39789a

7 years agoEGL: add color space validation
Courtney Goeltzenleuchter [Fri, 23 Jun 2017 02:40:16 +0000 (02:40 +0000)]
EGL: add color space validation
am: 15f79786e1

Change-Id: I05600bda5553b6e5f49a055f30cfef60db4fa9e8

7 years agoEGL: add color space validation
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)

7 years agoMerge "EGL: add color space validation"
TreeHugger Robot [Thu, 22 Jun 2017 22:11:16 +0000 (22:11 +0000)]
Merge "EGL: add color space validation"

7 years agoMerge "surfaceflinger: discard stale commands" into oc-dev am: f8ca9a0875 am: 3addef29f7
Chia-I Wu [Thu, 22 Jun 2017 21:33:27 +0000 (21:33 +0000)]
Merge "surfaceflinger: discard stale commands" into oc-dev am: f8ca9a0875 am: 3addef29f7
am: a2d470b112

Change-Id: I3d59f6fe7851dfb59b99a73b9ffde187e29ab7b4

7 years agoMerge "LibGUI remove DEBUG" into oc-dev am: be597daebd am: 45bf98c36e
Fabien Sanglard [Thu, 22 Jun 2017 21:33:06 +0000 (21:33 +0000)]
Merge "LibGUI remove DEBUG" into oc-dev am: be597daebd am: 45bf98c36e
am: c7f641b011

Change-Id: I8e8951b15a95a05413aa44f3b7146cc67a5b02d9

7 years agoDisable skip Validate on client composition am: 269c236109 am: 0ff681ca77
Fabien Sanglard [Thu, 22 Jun 2017 21:32:43 +0000 (21:32 +0000)]
Disable skip Validate on client composition am: 269c236109 am: 0ff681ca77
am: 325193380d

Change-Id: Ia28ce44bc5b1b85b2fb42c2021ee0ac92a1e6639

7 years agoMerge "surfaceflinger: discard stale commands" into oc-dev am: f8ca9a0875 am: 49cdc635a2
Chia-I Wu [Thu, 22 Jun 2017 21:32:17 +0000 (21:32 +0000)]
Merge "surfaceflinger: discard stale commands" into oc-dev am: f8ca9a0875 am: 49cdc635a2
am: f37daee669

Change-Id: I433c7db5f0fd82d474dc5e4dac3dbdfe07a210a4

7 years agoMerge "LibGUI remove DEBUG" into oc-dev am: be597daebd am: d9517fe958
Fabien Sanglard [Thu, 22 Jun 2017 21:31:52 +0000 (21:31 +0000)]
Merge "LibGUI remove DEBUG" into oc-dev am: be597daebd am: d9517fe958
am: 70f644f329

Change-Id: Id489ee98cc82ad9023f75e6c56fec5efd81ad293

7 years agoDisable skip Validate on client composition am: 269c236109 am: 89283e56d6
Fabien Sanglard [Thu, 22 Jun 2017 21:31:21 +0000 (21:31 +0000)]
Disable skip Validate on client composition am: 269c236109 am: 89283e56d6
am: 00ce8550c5

Change-Id: I52df65bd858b3765ea5c81bb8a6aaa8c98a498b7

7 years agoMerge "surfaceflinger: discard stale commands" into oc-dev am: f8ca9a0875
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

7 years agoMerge "LibGUI remove DEBUG" into oc-dev am: be597daebd
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

7 years agoDisable skip Validate on client composition am: 269c236109
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

7 years agoMerge "surfaceflinger: discard stale commands" into oc-dev am: f8ca9a0875
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

7 years agoMerge "LibGUI remove DEBUG" into oc-dev am: be597daebd
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

7 years agoDisable skip Validate on client composition am: 269c236109
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

7 years agoMerge "surfaceflinger: discard stale commands" into oc-dev
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

7 years agoMerge "LibGUI remove DEBUG" into oc-dev
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

7 years agoDisable skip Validate on client composition
Fabien Sanglard [Thu, 22 Jun 2017 20:06:31 +0000 (20:06 +0000)]
Disable skip Validate on client composition
am: 269c236109

Change-Id: I4c0a4a90ff0ca2e39075ad643d1892597301d3fd

7 years agoMerge "surfaceflinger: discard stale commands" into oc-dev
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

7 years agoMerge "LibGUI remove DEBUG" into oc-dev
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

7 years agoDisable skip Validate on client composition
Fabien Sanglard [Thu, 22 Jun 2017 20:02:43 +0000 (20:02 +0000)]
Disable skip Validate on client composition
am: 269c236109

Change-Id: Ib0d2f8a9e59cf4618ed029fe35391f566d11bcfb

7 years agoMerge "surfaceflinger: discard stale commands" into oc-dev
Chia-I Wu [Thu, 22 Jun 2017 19:59:35 +0000 (19:59 +0000)]
Merge "surfaceflinger: discard stale commands" into oc-dev

7 years agoMerge "LibGUI remove DEBUG" into oc-dev
Fabien Sanglard [Thu, 22 Jun 2017 19:56:29 +0000 (19:56 +0000)]
Merge "LibGUI remove DEBUG" into oc-dev

7 years agoDisable skip Validate on client composition
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

7 years agosurfaceflinger: discard stale commands
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

7 years agoLibGUI remove DEBUG
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

7 years agoEGL: add color space validation
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

7 years agoMerge "Skip Validate am: 249c0ae80a am: 9837ce8210" into oc-dr1-dev-plus-aosp
Fabien Sanglard [Thu, 22 Jun 2017 06:05:27 +0000 (06:05 +0000)]
Merge "Skip Validate am: 249c0ae80a am: 9837ce8210" into oc-dr1-dev-plus-aosp
am: 63a2dd22be

Change-Id: Ib21942a7796af217091acef7d81bddfb9a080a83

7 years agoSkip Validate am: 249c0ae80a am: 8976c6ae37
Fabien Sanglard [Thu, 22 Jun 2017 06:04:33 +0000 (06:04 +0000)]
Skip Validate am: 249c0ae80a am: 8976c6ae37
am: 01b1acff34

Change-Id: I0640bf048df5b3c251239e06066eeae2f8b44636

7 years agoMerge "Skip Validate am: 249c0ae80a am: 9837ce8210" into oc-dr1-dev-plus-aosp
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

7 years agoSkip Validate am: 249c0ae80a
Fabien Sanglard [Thu, 22 Jun 2017 06:01:34 +0000 (06:01 +0000)]
Skip Validate am: 249c0ae80a
am: 9837ce8210

Change-Id: If81e98cd140426c5cc33595205fd9d4c26bef044

7 years agoSkip Validate am: 249c0ae80a
Fabien Sanglard [Thu, 22 Jun 2017 06:01:00 +0000 (06:01 +0000)]
Skip Validate am: 249c0ae80a
am: 8976c6ae37

Change-Id: I400dfd8d484779e5523353b002164f4f5ea41e03

7 years agoSkip Validate
Fabien Sanglard [Thu, 22 Jun 2017 05:58:06 +0000 (05:58 +0000)]
Skip Validate
am: 249c0ae80a

Change-Id: I336fce473d21e5fdfb80ad8eb48f1df5a24497d8

7 years agoSkip Validate
Fabien Sanglard [Thu, 22 Jun 2017 05:57:15 +0000 (05:57 +0000)]
Skip Validate
am: 249c0ae80a

Change-Id: I55a564d600a422915f43111f4e02a10857512fcf

7 years agoSkip Validate
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

7 years agoMerge "Update dumpstate binary file name" into oc-dr1-dev am: 8d897e6003
Jibu Joseph [Thu, 22 Jun 2017 04:45:06 +0000 (04:45 +0000)]
Merge "Update dumpstate binary file name" into oc-dr1-dev am: 8d897e6003
am: 990dc8c59c

Change-Id: Iadce5459a5edf5187134e2c246d7bbe00f735629

7 years agoMerge "Update dumpstate binary file name" into oc-dr1-dev
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

7 years agoMerge "Update dumpstate binary file name" into oc-dr1-dev
Jibu Joseph [Thu, 22 Jun 2017 04:36:00 +0000 (04:36 +0000)]
Merge "Update dumpstate binary file name" into oc-dr1-dev

7 years agoMerge changes from topic 'vendor_available_libgui' into oc-dr1-dev am: 8c72947af1
Jiyong Park [Wed, 21 Jun 2017 21:43:21 +0000 (21:43 +0000)]
Merge changes from topic 'vendor_available_libgui' into oc-dr1-dev am: 8c72947af1
am: a6fd7fedac

Change-Id: I367f259ab8e78091ca36d96d18b12510ab067344

7 years agoMerge changes from topic 'vendor_available_libgui' 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

7 years agoMerge changes from topic 'vendor_available_libgui' into oc-dr1-dev
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

7 years agoMerge "Check key before edit value in countFlushCompleteEventsLocked" into oc-dr1...
Peng Xu [Wed, 21 Jun 2017 20:54:19 +0000 (20:54 +0000)]
Merge "Check key before edit value in countFlushCompleteEventsLocked" into oc-dr1-dev am: 8669acc97d
am: f0eff80ab6

Change-Id: If794f597345d2949fa4194e36cae47a522888ea0

7 years agoMerge "Check key before edit value in countFlushCompleteEventsLocked" into oc-dr1-dev
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

7 years agoMerge "Check key before edit value in countFlushCompleteEventsLocked" into oc-dr1-dev
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

7 years agoUpdate dumpstate binary file name
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

7 years agoMerge "Add DVR method to get native display metrics" into oc-dr1-dev am: f412b2b9fc
Santos Cordon [Wed, 21 Jun 2017 18:08:30 +0000 (18:08 +0000)]
Merge "Add DVR method to get native display metrics" into oc-dr1-dev am: f412b2b9fc
am: 3abd8faac6

Change-Id: I8192a80f8e67163e6d4d08ba5bd8aaf589e6b91f

7 years agoMerge "Add DVR method to get native display metrics" into oc-dr1-dev
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

7 years agoMerge "Add DVR method to get native display metrics" into oc-dr1-dev
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

7 years agoMerge "Avoid SELinux violation at vndservicemanager" into oc-dr1-dev am: 5e6abb3f0a
Martijn Coenen [Wed, 21 Jun 2017 14:02:31 +0000 (14:02 +0000)]
Merge "Avoid SELinux violation at vndservicemanager" into oc-dr1-dev am: 5e6abb3f0a
am: 2e30c8e03d

Change-Id: Iaaf5dd70a213220bc23dacdb287ee75be5b9329c

7 years agoMerge "Avoid SELinux violation at vndservicemanager" 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

7 years agoMerge "Avoid SELinux violation at vndservicemanager" into oc-dr1-dev
Martijn Coenen [Wed, 21 Jun 2017 13:55:22 +0000 (13:55 +0000)]
Merge "Avoid SELinux violation at vndservicemanager" into oc-dr1-dev

7 years agoMake libgui available to vendors
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

7 years agoMark EGL/GLES libs as vendor_available
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

7 years agoChange export_include_dirs into export_header_lib_headers
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

7 years agodumpstate: Add the 2nd fd for binary file am: 9fbfad0b6d
Jie Song [Wed, 21 Jun 2017 02:01:35 +0000 (02:01 +0000)]
dumpstate: Add the 2nd fd for binary file am: 9fbfad0b6d
am: 1d22d6103b

Change-Id: Ib34bf06af9e074123af8b20c5164b922fdd504d8

7 years agodumpstate: Add the 2nd fd for binary file
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

7 years agoMerge "Move include/binder to libs/binder/include" am: d46d9f1243 am: b212140bbf...
Jiyong Park [Wed, 21 Jun 2017 00:56:00 +0000 (00:56 +0000)]
Merge "Move include/binder to libs/binder/include" am: d46d9f1243 am: b212140bbf  -s ours am: 7f683a8b8f  -s ours
am: 77e8c55ce5  -s ours

Change-Id: I172720eef8bc8f6a61a64bdf5b7550e148b14e26

7 years agoMerge "Move include/binder to libs/binder/include" am: d46d9f1243 am: b212140bbf...
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

7 years agoMerge "Move include/binder to libs/binder/include" am: d46d9f1243
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

7 years agoMerge "Move include/binder to libs/binder/include"
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

7 years agoMerge "Move include/binder to libs/binder/include"
Treehugger Robot [Wed, 21 Jun 2017 00:27:49 +0000 (00:27 +0000)]
Merge "Move include/binder to libs/binder/include"

7 years agoMerge "Remove backpressure ALOG"
TreeHugger Robot [Wed, 21 Jun 2017 00:20:28 +0000 (00:20 +0000)]
Merge "Remove backpressure ALOG"

7 years agoMerge "Clean up possible null dereference warning."
TreeHugger Robot [Tue, 20 Jun 2017 23:55:27 +0000 (23:55 +0000)]
Merge "Clean up possible null dereference warning."

7 years agoMerge "Reduce number of Fence syscalls made."
TreeHugger Robot [Tue, 20 Jun 2017 23:31:01 +0000 (23:31 +0000)]
Merge "Reduce number of Fence syscalls made."

7 years agodumpstate: Add the 2nd fd for binary file
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

7 years agoAvoid SELinux violation at vndservicemanager
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

7 years agoRemove backpressure ALOG
Fabien Sanglard [Tue, 20 Jun 2017 22:38:21 +0000 (15:38 -0700)]
Remove backpressure ALOG

The backpressure ALOG was needed to troubleshoot fence not signaling
while we worked on libhwc2on1adapter. Since these issues have been
resolved we don't need the log anymore.

Test: Manual
Change-Id: I29b2aa36f27f93d93ef14f1746d8c2f03101fc33

7 years agoMerge "Merge "surfaceflinger: fix a potential child layer leak" into oc-dev am: 1b02b...
Chia-I Wu [Tue, 20 Jun 2017 20:52:49 +0000 (20:52 +0000)]
Merge "Merge "surfaceflinger: fix a potential child layer leak" into oc-dev am: 1b02b6329e am: 989ed5c4c1" into oc-dr1-dev-plus-aosp
am: e58386a897

Change-Id: Ide20da61903dce4396a88a56c79ba34044354157

7 years agoMerge "surfaceflinger: fix a potential child layer leak" into oc-dev am: 1b02b6329e...
Chia-I Wu [Tue, 20 Jun 2017 20:52:22 +0000 (20:52 +0000)]
Merge "surfaceflinger: fix a potential child layer leak" into oc-dev am: 1b02b6329e am: 4d5cc90559
am: 4a96718e3e

Change-Id: Ia92eb6fb96ff972d1398eb6790a040fa6b42bec1

7 years agoMerge "Merge "surfaceflinger: fix a potential child layer leak" into oc-dev am: 1b02b...
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

7 years agoMerge "surfaceflinger: fix a potential child layer leak" into oc-dev am: 1b02b6329e
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

7 years agoMerge "surfaceflinger: fix a potential child layer leak" into oc-dev am: 1b02b6329e
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

7 years agoMerge "surfaceflinger: fix a potential child layer leak" into oc-dev
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

7 years agoMerge "surfaceflinger: fix a potential child layer leak" into oc-dev
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

7 years agoMerge "surfaceflinger: fix a potential child layer leak" into oc-dev
TreeHugger Robot [Tue, 20 Jun 2017 20:15:29 +0000 (20:15 +0000)]
Merge "surfaceflinger: fix a potential child layer leak" into oc-dev

7 years agoCheck key before edit value in countFlushCompleteEventsLocked
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

7 years agoReduce number of Fence syscalls made.
Brian Anderson [Fri, 26 May 2017 23:23:54 +0000 (16:23 -0700)]
Reduce number of Fence syscalls made.

This patch saves 6 or more Fence syscalls per frame.

* Timelines are updated just before adding a new fence
  since the newly added fence is unlikely to have signaled.
* Layer::latch uses a FenceTime now, so the signal time is
  automatically shared with other owners of the FenceTime.
* DispSync uses FenceTime now, only using cached values of
  the signal time that have been populated by a Timeline.

Test: SurfaceFlinger boots and dumps still work.
Change-Id: Ie0cfc1af2aca143dd8d5f08f08dbe1e597376f2f

7 years agoAdd DVR method to get native display metrics
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)

7 years agoMerge "Fix minor version bump reflected in lshal --init-vintf" am: ac6575097d am...
Yifan Hong [Tue, 20 Jun 2017 05:05:10 +0000 (05:05 +0000)]
Merge "Fix minor version bump reflected in lshal --init-vintf" am: ac6575097d am: 99065302ed am: cf64ff00ea  -s ours
am: e787161e19  -s ours

Change-Id: Id28857bc67fcd6100d4a895cef086c5da64fc555

7 years agoMerge "Fix minor version bump reflected in lshal --init-vintf" am: ac6575097d am...
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

7 years agoMerge "Fix minor version bump reflected in lshal --init-vintf" am: ac6575097d
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

7 years agoMerge "Fix minor version bump reflected in lshal --init-vintf"
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

7 years agoMerge "Fix minor version bump reflected in lshal --init-vintf"
Treehugger Robot [Tue, 20 Jun 2017 01:06:52 +0000 (01:06 +0000)]
Merge "Fix minor version bump reflected in lshal --init-vintf"

7 years agoFix minor version bump reflected in lshal --init-vintf am: e86f70b474
Yifan Hong [Tue, 20 Jun 2017 01:04:17 +0000 (01:04 +0000)]
Fix minor version bump reflected in lshal --init-vintf am: e86f70b474
am: cab805aa80

Change-Id: Idf92e510713e438f8a649e411eecbb4e61715eee

7 years agoFix 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

7 years agoMerge "Fix incorrect bitness for lshal --init-vintf" am: e162a97703 am: 126eee4d14...
Yifan Hong [Mon, 19 Jun 2017 23:40:49 +0000 (23:40 +0000)]
Merge "Fix incorrect bitness for lshal --init-vintf" am: e162a97703 am: 126eee4d14 am: c77bc022f7  -s ours
am: 1987126c27  -s ours

Change-Id: I049166d7bf1102a9b9af79b07598cfe5bb25eece

7 years agoMerge "Fix incorrect bitness for lshal --init-vintf" am: e162a97703 am: 126eee4d14
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

7 years agoMerge "Fix incorrect bitness for lshal --init-vintf" am: e162a97703
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

7 years agoMerge "Fix incorrect bitness for lshal --init-vintf"
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

7 years agoMerge "Fix incorrect bitness for lshal --init-vintf"
Treehugger Robot [Mon, 19 Jun 2017 22:51:52 +0000 (22:51 +0000)]
Merge "Fix incorrect bitness for lshal --init-vintf"

7 years agoFix minor version bump reflected in 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

7 years agoFix minor version bump reflected in 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