| commit | 845ed8fdaa34d0f684c93bf4dbadb9162f769235 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Mon Jan 14 13:53:09 2013 -0800 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jan 14 13:53:09 2013 -0800 |
| tree | ac3e5f221164700e6be23a1e0b766d4be595bdc9 | |
| parent | cbe5135610cd3c919e6334fada72cc52238bb8b0 [diff] | |
| parent | 27e2562868dcd3ad26f9b4677b64ae272941704e [diff] |
Merge "DisplayDevice: initialize mDisplayToken correctly"
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 @@ EGLConfig config) : mFlinger(flinger), mType(type), mHwcDisplayId(-1), + mDisplayToken(displayToken), mNativeWindow(nativeWindow), mFramebufferSurface(framebufferSurface), mDisplay(EGL_NO_DISPLAY),