TV: check surface validity before use (6b1e695c) · Commits · e / os / android_frameworks_base

services/core/jni/com_android_server_tv_TvInputHal.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -414,12 +414,9 @@ int JTvInputHal::removeStream(int deviceId, int streamId) {
		return NO_ERROR;
		}
		if (Surface::isValid(connection.mSurface)) {
		connection.mSurface.clear();
		}
		if (connection.mSurface != NULL) {
		connection.mSurface->setSidebandStream(NULL);
		connection.mSurface.clear();
		}
		connection.mSurface.clear();
		if (connection.mThread != NULL) {
		connection.mThread->shutdown();
		connection.mThread.clear();
		@@ -616,6 +613,9 @@ static int nativeAddOrUpdateStream(JNIEnv* env, jclass clazz,
		return BAD_VALUE;
		}
		sp<Surface> surface(android_view_Surface_getSurface(env, jsurface));
		if (!Surface::isValid(surface)) {
		return BAD_VALUE;
		}
		return tvInputHal->addOrUpdateStream(deviceId, streamId, surface);
		}