am 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"

* commit '845ed8fdaa34d0f684c93bf4dbadb9162f769235':
  DisplayDevice: initialize mDisplayToken correctly
This commit is contained in:
Jesse Hall 2013-01-14 14:34:15 -08:00 committed by Android Git Automerger
commit fc866eb842

View File

@ -77,6 +77,7 @@ DisplayDevice::DisplayDevice(
EGLConfig config) EGLConfig config)
: mFlinger(flinger), : mFlinger(flinger),
mType(type), mHwcDisplayId(-1), mType(type), mHwcDisplayId(-1),
mDisplayToken(displayToken),
mNativeWindow(nativeWindow), mNativeWindow(nativeWindow),
mFramebufferSurface(framebufferSurface), mFramebufferSurface(framebufferSurface),
mDisplay(EGL_NO_DISPLAY), mDisplay(EGL_NO_DISPLAY),