diff options
| author | John Reck <jreck@google.com> | 2014-03-06 20:42:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-06 20:42:52 +0000 |
| commit | d621e77c8dfc99d0c347ff4cef765e9809f51333 (patch) | |
| tree | 7fa5aba61dbebf905f4597159768bf45904c8cec /opengl/java | |
| parent | 16340670aff0ec980fff4354d785a38b11c33d3b (diff) | |
| parent | 198d20842a537f3df3584ea084e74220e172b086 (diff) | |
Merge "Workaround apps not calling super.onDetachedFromWindow()"
Diffstat (limited to 'opengl/java')
| -rw-r--r-- | opengl/java/android/opengl/GLSurfaceView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java index 5a2e261fa3a4..d88a1346b688 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 onDetachedFromWindow() { + protected void onDetachedFromWindowInternal() { 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.onDetachedFromWindow(); + super.onDetachedFromWindowInternal(); } // ---------------------------------------------------------------------- |