Merge "TIF: fix NPE for TvInputHardwareManager" into lmp-mr1-dev (f0a8c3e6) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/tv/TvInputHardwareManager.java

+19 −12

Original line number	Diff line number	Diff line
		@@ -673,30 +673,37 @@ class TvInputHardwareManager implements TvInputHal.Callback {
		if (mReleased) {
		throw new IllegalStateException("Device already released.");
		}
		if (surface != null && config == null) {
		return false;
		}
		if (surface == null && mActiveConfig == null) {
		return false;
		}

		int result = TvInputHal.ERROR_UNKNOWN;
		if (surface == null) {
		// The value of config is ignored when surface == null.
		if (mActiveConfig != null) {
		result = mHal.removeStream(mInfo.getDeviceId(), mActiveConfig);
		mActiveConfig = null;
		} else {
		if (!config.equals(mActiveConfig)) {
		// We already have no active stream.
		return true;
		}
		} else {
		// It's impossible to set a non-null surface with a null config.
		if (config == null) {
		return false;
		}
		// Remove stream only if we have an existing active configuration.
		if (mActiveConfig != null && !config.equals(mActiveConfig)) {
		result = mHal.removeStream(mInfo.getDeviceId(), mActiveConfig);
		if (result != TvInputHal.SUCCESS) {
		mActiveConfig = null;
		return false;
		}
		}
		// Proceed only if all previous operations succeeded.
		if (result == TvInputHal.SUCCESS) {
		result = mHal.addOrUpdateStream(mInfo.getDeviceId(), surface, config);
		if (result == TvInputHal.SUCCESS) {
		mActiveConfig = config;
		}
		}
		}
		updateAudioConfigLocked();
		return result == TvInputHal.SUCCESS;
		}