diff options
| author | Bart Sears <bsears@google.com> | 2014-03-06 21:10:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-06 21:10:06 +0000 |
| commit | acbc41d656be91854d9c128aee06b5ecc9f54528 (patch) | |
| tree | 385565253afa0fa4de8a5dec11e4b93e239f4eec /opengl/java/android | |
| parent | d621e77c8dfc99d0c347ff4cef765e9809f51333 (diff) | |
| parent | bac16fae7e6fceb1e516252ede673844b772e7c3 (diff) | |
| download | frameworks_base-acbc41d656be91854d9c128aee06b5ecc9f54528.zip frameworks_base-acbc41d656be91854d9c128aee06b5ecc9f54528.tar.gz frameworks_base-acbc41d656be91854d9c128aee06b5ecc9f54528.tar.bz2 | |
Merge "Revert "Workaround apps not calling super.onDetachedFromWindow()""
Diffstat (limited to 'opengl/java/android')
| -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 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(); } // ---------------------------------------------------------------------- |