Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev

Browse Source
This commit is contained in:
John Reck
2014-10-01 19:11:02 +00:00
committed by Android (Google) Code Review
parent c6a06d437c 77e4a5250f
commit 8786a962f0
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/SurfaceView.java
View File

@@ -256,9 +256,8 @@ public class SurfaceView extends View {
updateWindow(false, false);
}
/** @hide */
@Override
protected void onDetachedFromWindowInternal() {
protected void onDetachedFromWindow() {
if (mGlobalListenersAdded) {
ViewTreeObserver observer = getViewTreeObserver();
observer.removeOnScrollChangedListener(mScrollChangedListener);
@@ -280,7 +279,7 @@ public class SurfaceView extends View {
mSession = null;
mLayout.token = null;
super.onDetachedFromWindowInternal();
super.onDetachedFromWindow();
}
@Override

5
opengl/java/android/opengl/GLSurfaceView.java
View File

@@ -595,9 +595,8 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
mDetached = false;
}
/** @hide */
@Override
protected void onDetachedFromWindowInternal() {
protected void onDetachedFromWindow() {
if (LOG_ATTACH_DETACH) {
Log.d(TAG, "onDetachedFromWindow");
}
@@ -605,7 +604,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
mGLThread.requestExitAndWait();
}
mDetached = true;
super.onDetachedFromWindowInternal();
super.onDetachedFromWindow();
}
// ----------------------------------------------------------------------