Merge "Change resource claim to sync to avoid resource conflict" (f8d76455) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -241,6 +241,7 @@ public class Tuner implements AutoCloseable {
	.write(FrameworkStatsLog.TV_TUNER_STATE_CHANGED, mUserId,		.write(FrameworkStatsLog.TV_TUNER_STATE_CHANGED, mUserId,
	FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__UNKNOWN);		FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__UNKNOWN);
	}		}
			releaseAll();
	mHandler.sendMessage(mHandler.obtainMessage(MSG_RESOURCE_LOST));		mHandler.sendMessage(mHandler.obtainMessage(MSG_RESOURCE_LOST));
	}		}
	};		};
	@@ -511,7 +512,6 @@ public class Tuner implements AutoCloseable {
	break;		break;
	}		}
	case MSG_RESOURCE_LOST: {		case MSG_RESOURCE_LOST: {
	releaseAll();
	if (mOnResourceLostListener != null		if (mOnResourceLostListener != null
	&& mOnResourceLostListenerExecutor != null) {		&& mOnResourceLostListenerExecutor != null) {
	mOnResourceLostListenerExecutor.execute(		mOnResourceLostListenerExecutor.execute(