Merge "Make sure we clean up after ourselves" (5ab92c03) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+18 −15

Original line number	Diff line number	Diff line
		@@ -2130,7 +2130,7 @@ public final class ViewRootImpl implements ViewParent,
		}

		/**
		* @return true if drawing was succesful, false if an error occured
		* @return true if drawing was succesfull, false if an error occurred
		*/
		private boolean drawSoftware(Surface surface, AttachInfo attachInfo, int yoff,
		boolean scalingRequired, Rect dirty) {
		@@ -3843,13 +3843,13 @@ public final class ViewRootImpl implements ViewParent,
		if (LOCAL_LOGV) Log.v(TAG, "DIE in " + this + " of " + mSurface);
		synchronized (this) {
		if (mAdded) {
		mAdded = false;
		dispatchDetachedFromWindow();
		}

		if (mAdded && !mFirst) {
		destroyHardwareRenderer();

		if (mView != null) {
		int viewVisibility = mView.getVisibility();
		boolean viewVisibilityChanged = mViewVisibility != viewVisibility;
		if (mWindowAttributesChanged \|\| viewVisibilityChanged) {
		@@ -3868,6 +3868,9 @@ public final class ViewRootImpl implements ViewParent,
		mSurface.release();
		}
		}

		mAdded = false;
		}
		}

		public void requestUpdateConfiguration(Configuration config) {