summaryrefslogtreecommitdiffstats
path: root/opengl/java
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2011-11-21 21:08:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-21 21:08:42 -0800
commit3526b00a53a2582a51ff8b98ac1400a48f351107 (patch)
tree57b86400dcced49117b636cbf6598247adfa1739 /opengl/java
parent79de26ea20ddd65e7c361e138a6f992fd3802c22 (diff)
parentc26e4d18a20ab0b3e769fb3e547994f1c27d6713 (diff)
downloadframeworks_base-3526b00a53a2582a51ff8b98ac1400a48f351107.zip
frameworks_base-3526b00a53a2582a51ff8b98ac1400a48f351107.tar.gz
frameworks_base-3526b00a53a2582a51ff8b98ac1400a48f351107.tar.bz2
am c26e4d18: am 8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1
* commit 'c26e4d18a20ab0b3e769fb3e547994f1c27d6713': Notify views when EGL resources are about to be destroyed Bug #5639899
Diffstat (limited to 'opengl/java')
-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();
}