summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/SurfaceFlinger.cpp
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2011-02-02 16:46:46 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-02-02 16:46:46 -0800
commit721f3a6ea3df863655b5b4d7af8c2049d35fb77a (patch)
treec111a47647ae4730a16a0a82d0e0521c7f1c1c02 /services/surfaceflinger/SurfaceFlinger.cpp
parent4d8a596665dd73105b79081665df02f36ba53f27 (diff)
parent50b029d578fa06cd0733dcc7c69cb94f5f824908 (diff)
am 50b029d5: am 7ba35f5a: Merge "[3418265] apply layer transformations to the DimLayer." into honeycomb
* commit '50b029d578fa06cd0733dcc7c69cb94f5f824908': [3418265] apply layer transformations to the DimLayer.
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 87b66eafa985..fd3f0c263072 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -259,8 +259,6 @@ status_t SurfaceFlinger::readyToRun()
glLoadIdentity();
glOrthof(0, w, h, 0, 0, 1);
- LayerDim::initDimmer(this, w, h);
-
mReadyToRunBarrier.open();
/*