diff options
author | Jamie Gennis <jgennis@google.com> | 2013-10-15 17:29:21 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-15 17:29:21 -0700 |
commit | 5727fc08ba39bb53e9191447e1b3144ea244ae0e (patch) | |
tree | 2352c4e410db6271e11527ba5ddc5b95ef8cecd7 /services/surfaceflinger/SurfaceFlinger.h | |
parent | c6694b4cb4829164cd490869c557103f310fd761 (diff) | |
parent | 47c772e8ec28eb0a3df9c8edd252f292c7c8e152 (diff) | |
download | frameworks_native-5727fc08ba39bb53e9191447e1b3144ea244ae0e.zip frameworks_native-5727fc08ba39bb53e9191447e1b3144ea244ae0e.tar.gz frameworks_native-5727fc08ba39bb53e9191447e1b3144ea244ae0e.tar.bz2 |
am 47c772e8: am d1700756: SurfaceFlinger: Add EventControlThread
* commit '47c772e8ec28eb0a3df9c8edd252f292c7c8e152':
SurfaceFlinger: Add EventControlThread
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.h')
-rw-r--r-- | services/surfaceflinger/SurfaceFlinger.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index 7caf1fc..228c36f 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -68,6 +68,7 @@ class Layer; class LayerDim; class Surface; class RenderEngine; +class EventControlThread; // --------------------------------------------------------------------------- @@ -428,6 +429,7 @@ private: nsecs_t mBootTime; bool mGpuToCpuSupported; sp<EventThread> mEventThread; + sp<EventControlThread> mEventControlThread; EGLContext mEGLContext; EGLConfig mEGLConfig; EGLDisplay mEGLDisplay; @@ -481,7 +483,6 @@ private: bool mHasColorMatrix; }; -// --------------------------------------------------------------------------- }; // namespace android #endif // ANDROID_SURFACE_FLINGER_H |