Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev (8786a962) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceView.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -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

+2 −3

Original line number	Diff line number	Diff line
		@@ -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();
		}

		// ----------------------------------------------------------------------