diff options
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.h')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index 6d36719..de97167 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -327,10 +327,13 @@ private: // called when starting, or restarting after system_server death void initializeDisplays(); + // NOTE: can only be called from the main thread or with mStateLock held sp<const DisplayDevice> getDisplayDevice(const wp<IBinder>& dpy) const { return mDisplays.valueFor(dpy); } - const sp<DisplayDevice>& getDisplayDevice(const wp<IBinder>& dpy) { + + // NOTE: can only be called from the main thread or with mStateLock held + sp<DisplayDevice> getDisplayDevice(const wp<IBinder>& dpy) { return mDisplays.valueFor(dpy); } @@ -398,7 +401,8 @@ private: volatile int32_t mTransactionFlags; Condition mTransactionCV; SortedVector<sp<LayerBase> > mLayerPurgatory; - bool mTransationPending; + bool mTransactionPending; + bool mAnimTransactionPending; Vector<sp<LayerBase> > mLayersPendingRemoval; // protected by mStateLock (but we could use another lock) @@ -424,6 +428,9 @@ private: State mDrawingState; bool mVisibleRegionsDirty; bool mHwWorkListDirty; + + // this may only be written from the main thread with mStateLock held + // it may be read from other threads with mStateLock held DefaultKeyedVector< wp<IBinder>, sp<DisplayDevice> > mDisplays; // don't use a lock for these, we don't care |