OSDN Git Service

Merge "libsurfaceflinger: handle WINDOW_TYPE_DONT_SCREENSHOT" into oc-dr1-dev
authorChia-I Wu <olv@google.com>
Thu, 3 Aug 2017 12:53:49 +0000 (12:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 12:53:49 +0000 (12:53 +0000)
commit7cc9d29816baaa85185b4e13ebb05bfb1cc2dfce
tree6bec42646ff214ba9e4cf45f7a5f9eb4083d1686
parent0f6c276edd9b0ab86636c23070fae763d4baad9c
parent1e9bf7c91b359747cc3d043caec66922618ca79d
Merge "libsurfaceflinger: handle WINDOW_TYPE_DONT_SCREENSHOT" into oc-dr1-dev
am: 1e9bf7c91b

Change-Id: Ie0d80934d0bf1d92ecfb2ab491cdf2b374132c17
services/surfaceflinger/SurfaceFlinger.cpp
services/surfaceflinger/SurfaceFlinger_hwc1.cpp