summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorBart Sears <bsears@google.com>2014-03-06 21:09:51 +0000
committerBart Sears <bsears@google.com>2014-03-06 21:09:51 +0000
commitbac16fae7e6fceb1e516252ede673844b772e7c3 (patch)
tree9692f596099b9fcdc4a25c00051fb443f430329e /opengl
parent198d20842a537f3df3584ea084e74220e172b086 (diff)
downloadframeworks_base-bac16fae7e6fceb1e516252ede673844b772e7c3.zip
frameworks_base-bac16fae7e6fceb1e516252ede673844b772e7c3.tar.gz
frameworks_base-bac16fae7e6fceb1e516252ede673844b772e7c3.tar.bz2
Revert "Workaround apps not calling super.onDetachedFromWindow()"
Requested by jreck to fix the build. This reverts commit 198d20842a537f3df3584ea084e74220e172b086. Change-Id: I733065cc124b59bf914034f5bac5e2e951a5b604
Diffstat (limited to 'opengl')
-rw-r--r--opengl/java/android/opengl/GLSurfaceView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java
index d88a134..5a2e261 100644
--- a/opengl/java/android/opengl/GLSurfaceView.java
+++ b/opengl/java/android/opengl/GLSurfaceView.java
@@ -601,7 +601,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
* Must not be called before a renderer has been set.
*/
@Override
- protected void onDetachedFromWindowInternal() {
+ protected void onDetachedFromWindow() {
if (LOG_ATTACH_DETACH) {
Log.d(TAG, "onDetachedFromWindow");
}
@@ -609,7 +609,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
mGLThread.requestExitAndWait();
}
mDetached = true;
- super.onDetachedFromWindowInternal();
+ super.onDetachedFromWindow();
}
// ----------------------------------------------------------------------