Merge "Tuner FW: fix filter type check." into rvc-dev am: 9c03ae0623 am: e0ab676c03 (60b80a9f) · Commits · e / os / android_frameworks_base

media/java/android/media/tv/tuner/Tuner.java

+7 −5

Original line number	Original line	Diff line number	Diff line
	@@ -447,7 +447,7 @@ public class Tuner implements AutoCloseable {
	private native DvrRecorder nativeOpenDvrRecorder(long bufferSize);		private native DvrRecorder nativeOpenDvrRecorder(long bufferSize);
	private native DvrPlayback nativeOpenDvrPlayback(long bufferSize);		private native DvrPlayback nativeOpenDvrPlayback(long bufferSize);

	private static native DemuxCapabilities nativeGetDemuxCapabilities();		private native DemuxCapabilities nativeGetDemuxCapabilities();

	private native int nativeCloseDemux(int handle);		private native int nativeCloseDemux(int handle);
	private native int nativeCloseFrontend(int handle);		private native int nativeCloseFrontend(int handle);
	@@ -939,8 +939,7 @@ public class Tuner implements AutoCloseable {
	Filter filter = nativeOpenFilter(		Filter filter = nativeOpenFilter(
	mainType, TunerUtils.getFilterSubtype(mainType, subType), bufferSize);		mainType, TunerUtils.getFilterSubtype(mainType, subType), bufferSize);
	if (filter != null) {		if (filter != null) {
	filter.setMainType(mainType);		filter.setType(mainType, subType);
	filter.setSubtype(subType);
	filter.setCallback(cb, executor);		filter.setCallback(cb, executor);
	if (mHandler == null) {		if (mHandler == null) {
	mHandler = createEventHandler();		mHandler = createEventHandler();
	@@ -1147,8 +1146,11 @@ public class Tuner implements AutoCloseable {
	}		}

	/* package */ void releaseLnb() {		/* package */ void releaseLnb() {
			if (mLnbHandle != null) {
			// LNB handle can be null if it's opened by name.
	mTunerResourceManager.releaseLnb(mLnbHandle, mClientId);		mTunerResourceManager.releaseLnb(mLnbHandle, mClientId);
	mLnbHandle = null;		mLnbHandle = null;
			}
	mLnb = null;		mLnb = null;
	}		}
	}		}

media/java/android/media/tv/tuner/filter/Filter.java

+2 −5

Original line number	Original line	Diff line number	Diff line
	@@ -221,12 +221,9 @@ public class Filter implements AutoCloseable {
	}		}

	/** @hide */		/** @hide */
	public void setMainType(@Type int mainType) {		public void setType(@Type int mainType, @Subtype int subtype) {
	mMainType = mainType;		mMainType = mainType;
	}		mSubtype = TunerUtils.getFilterSubtype(mainType, subtype);
	/** @hide */
	public void setSubtype(@Subtype int subtype) {
	mSubtype = subtype;
	}		}

	/** @hide */		/** @hide */

media/jni/android_media_tv_Tuner.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2975,7 +2975,7 @@ static jint copyData(JNIEnv env, std::unique_ptr<MQ>& mq, EventFlag flag, jbyt
	jbyte *dst = env->GetByteArrayElements(buffer, &isCopy);		jbyte *dst = env->GetByteArrayElements(buffer, &isCopy);
	ALOGD("copyData, isCopy=%d", isCopy);		ALOGD("copyData, isCopy=%d", isCopy);
	if (dst == nullptr) {		if (dst == nullptr) {
	ALOGD("Failed to GetByteArrayElements");		jniThrowRuntimeException(env, "Failed to GetByteArrayElements");
	return 0;		return 0;
	}		}

	@@ -2983,7 +2983,7 @@ static jint copyData(JNIEnv env, std::unique_ptr<MQ>& mq, EventFlag flag, jbyt
	env->ReleaseByteArrayElements(buffer, dst, 0);		env->ReleaseByteArrayElements(buffer, dst, 0);
	flag->wake(static_cast<uint32_t>(DemuxQueueNotifyBits::DATA_CONSUMED));		flag->wake(static_cast<uint32_t>(DemuxQueueNotifyBits::DATA_CONSUMED));
	} else {		} else {
	ALOGD("Failed to read FMQ");		jniThrowRuntimeException(env, "Failed to read FMQ");
	env->ReleaseByteArrayElements(buffer, dst, 0);		env->ReleaseByteArrayElements(buffer, dst, 0);
	return 0;		return 0;
	}		}