summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <android-build-merger@google.com> 2017-08-14 00:36:26 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-08-14 00:36:26 +0000
commitbba7d5aa3003bbb22ce1ee0add7e4440ee98ba92 (patch)
treeb9d66be338f09b1bcb81ae96f596e03ddf8cfe3f
parent75571fe9d54400636b1d5e2f04fd8838b34efc5e (diff)
parent2a30164a03b876cfbfab08651f85d60c881d48c2 (diff)
Merge "libsurfaceflinger: fix screenshot permission check am: fc0b911090" into oc-dr1-dev-plus-aosp
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 0f6c581e14..a57e8cf3e4 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4392,7 +4392,7 @@ status_t SurfaceFlinger::captureScreenImplLocked(const sp<const DisplayDevice>&
bool secureLayerIsVisible = false;
for (const auto& layer : mDrawingState.layersSortedByZ) {
const Layer::State& state(layer->getDrawingState());
- if (layer->belongsToDisplay(hw->getLayerStack(), false) ||
+ if (!layer->belongsToDisplay(hw->getLayerStack(), false) ||
(state.z < minLayerZ || state.z > maxLayerZ)) {
continue;
}