Merge "SurfaceView: Release Surfaces where SurfaceControl are released." (135906a5) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceView.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -675,6 +675,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
	mTmpTransaction.remove(mBackgroundControl);		mTmpTransaction.remove(mBackgroundControl);
	mBackgroundControl = null;		mBackgroundControl = null;
	}		}
			mSurface.release();
	mTmpTransaction.apply();		mTmpTransaction.apply();
	}		}
	}		}
	@@ -962,7 +963,6 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
	} finally {		} finally {
	mIsCreating = false;		mIsCreating = false;
	if (mSurfaceControl != null && !mSurfaceCreated) {		if (mSurfaceControl != null && !mSurfaceCreated) {
	mSurface.release();
	releaseSurfaces();		releaseSurfaces();
	}		}
	}		}
	@@ -1143,6 +1143,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
	mRtTransaction.remove(mBackgroundControl);		mRtTransaction.remove(mBackgroundControl);
	mSurfaceControl = null;		mSurfaceControl = null;
	mBackgroundControl = null;		mBackgroundControl = null;
			mSurface.release();
	}		}
	mRtHandlingPositionUpdates = false;		mRtHandlingPositionUpdates = false;
	}		}