summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2013-09-17 03:27:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-17 03:27:15 +0000
commit2a36497e45d4d96e35fed89cfdcb09b71459ac3c (patch)
tree133f9b3da144408070bb830d181e943002c7bd61 /services/surfaceflinger
parenta2ba428a22125558a129c6ba4001dfc2169de2fe (diff)
parent83cafffeac037ab2f9d00f98f8d2f3da8fc9b857 (diff)
downloadframeworks_native-2a36497e45d4d96e35fed89cfdcb09b71459ac3c.zip
frameworks_native-2a36497e45d4d96e35fed89cfdcb09b71459ac3c.tar.gz
frameworks_native-2a36497e45d4d96e35fed89cfdcb09b71459ac3c.tar.bz2
Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev
Diffstat (limited to 'services/surfaceflinger')
-rw-r--r--services/surfaceflinger/DisplayDevice.cpp2
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 61a9361..917d4cd 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -73,7 +73,7 @@ DisplayDevice::DisplayDevice(
mLayerStack(NO_LAYER_STACK),
mOrientation()
{
- mNativeWindow = new Surface(producer);
+ mNativeWindow = new Surface(producer, false);
ANativeWindow* const window = mNativeWindow.get();
int format;
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index fa1ea09..def4618 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2782,7 +2782,7 @@ status_t SurfaceFlinger::captureScreenImplLocked(
// create a surface (because we're a producer, and we need to
// dequeue/queue a buffer)
- sp<Surface> sur = new Surface(producer);
+ sp<Surface> sur = new Surface(producer, false);
ANativeWindow* window = sur.get();
status_t result = NO_ERROR;