summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2011-11-21 17:57:05 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-21 17:57:05 -0800
commit8cd39e3a104d0739fd2f1ae73e5f4081f1528c6c (patch)
tree5d4f83eb6b015f92c614788c93e834e9790acd85 /opengl
parentfb0784da5f602bf6410ef914d625c3cedfa11e9f (diff)
parent31f2c2e94656530fbf6282803e62edb47e9a894d (diff)
downloadframeworks_base-8cd39e3a104d0739fd2f1ae73e5f4081f1528c6c.zip
frameworks_base-8cd39e3a104d0739fd2f1ae73e5f4081f1528c6c.tar.gz
frameworks_base-8cd39e3a104d0739fd2f1ae73e5f4081f1528c6c.tar.bz2
Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1
Diffstat (limited to 'opengl')
-rw-r--r--opengl/java/android/opengl/ManagedEGLContext.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/opengl/java/android/opengl/ManagedEGLContext.java b/opengl/java/android/opengl/ManagedEGLContext.java
index d3a3662..1eafbca 100644
--- a/opengl/java/android/opengl/ManagedEGLContext.java
+++ b/opengl/java/android/opengl/ManagedEGLContext.java
@@ -47,8 +47,7 @@ import com.google.android.gles_jni.EGLImpl;
public abstract class ManagedEGLContext {
static final String TAG = "ManagedEGLContext";
- static final ArrayList<ManagedEGLContext> sActive
- = new ArrayList<ManagedEGLContext>();
+ static final ArrayList<ManagedEGLContext> sActive = new ArrayList<ManagedEGLContext>();
final EGLContext mContext;
@@ -127,7 +126,7 @@ public abstract class ManagedEGLContext {
sActive.clear();
}
- for (int i=0; i<active.size(); i++) {
+ for (int i = 0; i < active.size(); i++) {
active.get(i).execTerminate();
}