summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2013-01-14 13:53:09 -0800
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-01-14 13:53:09 -0800
commit845ed8fdaa34d0f684c93bf4dbadb9162f769235 (patch)
treeac3e5f221164700e6be23a1e0b766d4be595bdc9 /services
parentcbe5135610cd3c919e6334fada72cc52238bb8b0 (diff)
parent27e2562868dcd3ad26f9b4677b64ae272941704e (diff)
downloadframeworks_native-845ed8fdaa34d0f684c93bf4dbadb9162f769235.zip
frameworks_native-845ed8fdaa34d0f684c93bf4dbadb9162f769235.tar.gz
frameworks_native-845ed8fdaa34d0f684c93bf4dbadb9162f769235.tar.bz2
Merge "DisplayDevice: initialize mDisplayToken correctly"
Diffstat (limited to 'services')
-rw-r--r--services/surfaceflinger/DisplayDevice.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index ce98b67..69b9c34 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -77,6 +77,7 @@ DisplayDevice::DisplayDevice(
EGLConfig config)
: mFlinger(flinger),
mType(type), mHwcDisplayId(-1),
+ mDisplayToken(displayToken),
mNativeWindow(nativeWindow),
mFramebufferSurface(framebufferSurface),
mDisplay(EGL_NO_DISPLAY),