summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger/Layer.cpp
diff options
context:
space:
mode:
authorEric Hassold <hassold@google.com>2011-03-11 15:08:16 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-11 15:08:16 -0800
commitf667740d28eec82dabe89cc6f3e5a67f63451952 (patch)
tree307ef48fe59d2d0b46c01492dccff5319dade936 /services/surfaceflinger/Layer.cpp
parent4c1ac4e66560f53625de28663c67e81a5f8f4401 (diff)
parentb6c0f51d6a7b5f143428fd507d0a586bbd0a4a6e (diff)
downloadframeworks_base-f667740d28eec82dabe89cc6f3e5a67f63451952.zip
frameworks_base-f667740d28eec82dabe89cc6f3e5a67f63451952.tar.gz
frameworks_base-f667740d28eec82dabe89cc6f3e5a67f63451952.tar.bz2
Merge "Default to NONE format in Layer"
Diffstat (limited to 'services/surfaceflinger/Layer.cpp')
-rw-r--r--services/surfaceflinger/Layer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 1297363..4afe905 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -59,7 +59,8 @@ Layer::Layer(SurfaceFlinger* flinger,
mProtectedByApp(false),
mTextureManager(),
mBufferManager(mTextureManager),
- mWidth(0), mHeight(0), mNeedsScaling(false), mFixedSize(false)
+ mWidth(0), mHeight(0), mFormat(PIXEL_FORMAT_NONE),
+ mNeedsScaling(false), mFixedSize(false)
{
}