diff options
| author | John Reck <jreck@google.com> | 2014-03-06 22:06:20 +0000 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2014-03-06 14:12:35 -0800 |
| commit | b14dfe20ef300c47cc5cdfbd844c21f7fd302f0c (patch) | |
| tree | 894d9b7652c64bd77185c064433d0271b2f4569b /opengl/java | |
| parent | acbc41d656be91854d9c128aee06b5ecc9f54528 (diff) | |
| download | frameworks_base-b14dfe20ef300c47cc5cdfbd844c21f7fd302f0c.zip frameworks_base-b14dfe20ef300c47cc5cdfbd844c21f7fd302f0c.tar.gz frameworks_base-b14dfe20ef300c47cc5cdfbd844c21f7fd302f0c.tar.bz2 | |
Revert "Revert "Workaround apps not calling super.onDetachedFromWindow()""
This reverts commit bac16fae7e6fceb1e516252ede673844b772e7c3.
Change-Id: I61e997b23fac1aa984129fdc0328426ff8891bdd
Diffstat (limited to 'opengl/java')
| -rw-r--r-- | opengl/java/android/opengl/GLSurfaceView.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java index 5a2e261..a9322b9 100644 --- a/opengl/java/android/opengl/GLSurfaceView.java +++ b/opengl/java/android/opengl/GLSurfaceView.java @@ -595,13 +595,9 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback mDetached = false; } - /** - * This method is used as part of the View class and is not normally - * called or subclassed by clients of GLSurfaceView. - * Must not be called before a renderer has been set. - */ + /** @hide */ @Override - protected void onDetachedFromWindow() { + protected void onDetachedFromWindowInternal() { if (LOG_ATTACH_DETACH) { Log.d(TAG, "onDetachedFromWindow"); } @@ -609,7 +605,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback mGLThread.requestExitAndWait(); } mDetached = true; - super.onDetachedFromWindow(); + super.onDetachedFromWindowInternal(); } // ---------------------------------------------------------------------- |