Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tuner APIs: add locks to avoid crashes caused by NPE" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-15 18:59:10 +00:00
committed by Android (Google) Code Review
parent 45877fb8a4 5558cb1cc9
commit d7d85eb143
5 changed files with 186 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
media/java/android/media/tv/tuner/Lnb.java
View File

@@ -148,6 +148,7 @@ public class Lnb implements AutoCloseable {
LnbCallback mCallback; LnbCallback mCallback;
Executor mExecutor; Executor mExecutor;
Tuner mTuner; Tuner mTuner;
private final Object mCallbackLock = new Object();
private native int nativeSetVoltage(int voltage); private native int nativeSetVoltage(int voltage);
@@ -164,20 +165,26 @@ public class Lnb implements AutoCloseable {
private Lnb() {} private Lnb() {}
void setCallback(Executor executor, @Nullable LnbCallback callback, Tuner tuner) { void setCallback(Executor executor, @Nullable LnbCallback callback, Tuner tuner) {
mCallback = callback; synchronized (mCallbackLock) {
mExecutor = executor; mCallback = callback;
mTuner = tuner; mExecutor = executor;
mTuner = tuner;
}
} }
private void onEvent(int eventType) { private void onEvent(int eventType) {
if (mExecutor != null && mCallback != null) { synchronized (mCallbackLock) {
mExecutor.execute(() -> mCallback.onEvent(eventType)); if (mExecutor != null && mCallback != null) {
mExecutor.execute(() -> mCallback.onEvent(eventType));
}
} }
} }
private void onDiseqcMessage(byte[] diseqcMessage) { private void onDiseqcMessage(byte[] diseqcMessage) {
if (mExecutor != null && mCallback != null) { synchronized (mCallbackLock) {
mExecutor.execute(() -> mCallback.onDiseqcMessage(diseqcMessage)); if (mExecutor != null && mCallback != null) {
mExecutor.execute(() -> mCallback.onDiseqcMessage(diseqcMessage));
}
} }
} }

223
media/java/android/media/tv/tuner/Tuner.java
View File

@@ -291,7 +291,7 @@ public class Tuner implements AutoCloseable {
@Nullable @Nullable
private OnTuneEventListener mOnTuneEventListener; private OnTuneEventListener mOnTuneEventListener;
@Nullable @Nullable
private Executor mOnTunerEventExecutor; private Executor mOnTuneEventExecutor;
@Nullable @Nullable
private ScanCallback mScanCallback; private ScanCallback mScanCallback;
@Nullable @Nullable
@@ -301,6 +301,10 @@ public class Tuner implements AutoCloseable {
@Nullable @Nullable
private Executor mOnResourceLostListenerExecutor; private Executor mOnResourceLostListenerExecutor;
private final Object mOnTuneEventLock = new Object();
private final Object mScanCallbackLock = new Object();
private final Object mOnResourceLostListenerLock = new Object();
private Integer mDemuxHandle; private Integer mDemuxHandle;
private Integer mFrontendCiCamHandle; private Integer mFrontendCiCamHandle;
private Integer mFrontendCiCamId; private Integer mFrontendCiCamId;
@@ -398,18 +402,22 @@ public class Tuner implements AutoCloseable {
*/ */
public void setResourceLostListener(@NonNull @CallbackExecutor Executor executor, public void setResourceLostListener(@NonNull @CallbackExecutor Executor executor,
@NonNull OnResourceLostListener listener) { @NonNull OnResourceLostListener listener) {
Objects.requireNonNull(executor, "OnResourceLostListener must not be null"); synchronized (mOnResourceLostListenerLock) {
Objects.requireNonNull(listener, "executor must not be null"); Objects.requireNonNull(executor, "OnResourceLostListener must not be null");
mOnResourceLostListener = listener; Objects.requireNonNull(listener, "executor must not be null");
mOnResourceLostListenerExecutor = executor; mOnResourceLostListener = listener;
mOnResourceLostListenerExecutor = executor;
}
} }
/** /**
* Removes the listener for resource lost. * Removes the listener for resource lost.
*/ */
public void clearResourceLostListener() { public void clearResourceLostListener() {
mOnResourceLostListener = null; synchronized (mOnResourceLostListenerLock) {
mOnResourceLostListenerExecutor = null; mOnResourceLostListener = null;
mOnResourceLostListenerExecutor = null;
}
} }
/** /**
@@ -618,10 +626,12 @@ public class Tuner implements AutoCloseable {
break; break;
} }
case MSG_RESOURCE_LOST: { case MSG_RESOURCE_LOST: {
if (mOnResourceLostListener != null synchronized (mOnResourceLostListenerLock) {
if (mOnResourceLostListener != null
&& mOnResourceLostListenerExecutor != null) { && mOnResourceLostListenerExecutor != null) {
mOnResourceLostListenerExecutor.execute( mOnResourceLostListenerExecutor.execute(
() -> mOnResourceLostListener.onResourceLost(Tuner.this)); () -> mOnResourceLostListener.onResourceLost(Tuner.this));
}
} }
break; break;
} }
@@ -652,8 +662,10 @@ public class Tuner implements AutoCloseable {
*/ */
public void setOnTuneEventListener(@NonNull @CallbackExecutor Executor executor, public void setOnTuneEventListener(@NonNull @CallbackExecutor Executor executor,
@NonNull OnTuneEventListener eventListener) { @NonNull OnTuneEventListener eventListener) {
mOnTuneEventListener = eventListener; synchronized (mOnTuneEventLock) {
mOnTunerEventExecutor = executor; mOnTuneEventListener = eventListener;
mOnTuneEventExecutor = executor;
}
} }
/** /**
@@ -663,9 +675,10 @@ public class Tuner implements AutoCloseable {
* @see #setOnTuneEventListener(Executor, OnTuneEventListener) * @see #setOnTuneEventListener(Executor, OnTuneEventListener)
*/ */
public void clearOnTuneEventListener() { public void clearOnTuneEventListener() {
mOnTuneEventListener = null; synchronized (mOnTuneEventLock) {
mOnTunerEventExecutor = null; mOnTuneEventListener = null;
mOnTuneEventExecutor = null;
}
} }
/** /**
@@ -747,32 +760,34 @@ public class Tuner implements AutoCloseable {
@Result @Result
public int scan(@NonNull FrontendSettings settings, @ScanType int scanType, public int scan(@NonNull FrontendSettings settings, @ScanType int scanType,
@NonNull @CallbackExecutor Executor executor, @NonNull ScanCallback scanCallback) { @NonNull @CallbackExecutor Executor executor, @NonNull ScanCallback scanCallback) {
/** synchronized (mScanCallbackLock) {
* Scan can be called again for blink scan if scanCallback and executor are same as before. // Scan can be called again for blink scan if scanCallback and executor are same as
*/ //before.
if (((mScanCallback != null) && (mScanCallback != scanCallback)) if (((mScanCallback != null) && (mScanCallback != scanCallback))
|| ((mScanCallbackExecutor != null) && (mScanCallbackExecutor != executor))) { || ((mScanCallbackExecutor != null) && (mScanCallbackExecutor != executor))) {
throw new IllegalStateException( throw new IllegalStateException(
"Different Scan session already in progress. stopScan must be called " "Different Scan session already in progress. stopScan must be called "
+ "before a new scan session can be " + "started."); + "before a new scan session can be " + "started.");
}
mFrontendType = settings.getType();
if (mFrontendType == FrontendSettings.TYPE_DTMB) {
if (!TunerVersionChecker.checkHigherOrEqualVersionTo(
TunerVersionChecker.TUNER_VERSION_1_1, "Scan with DTMB Frontend")) {
return RESULT_UNAVAILABLE;
} }
} mFrontendType = settings.getType();
if (checkResource(TunerResourceManager.TUNER_RESOURCE_TYPE_FRONTEND)) { if (mFrontendType == FrontendSettings.TYPE_DTMB) {
mScanCallback = scanCallback; if (!TunerVersionChecker.checkHigherOrEqualVersionTo(
mScanCallbackExecutor = executor; TunerVersionChecker.TUNER_VERSION_1_1,
mFrontendInfo = null; "Scan with DTMB Frontend")) {
FrameworkStatsLog return RESULT_UNAVAILABLE;
}
}
if (checkResource(TunerResourceManager.TUNER_RESOURCE_TYPE_FRONTEND)) {
mScanCallback = scanCallback;
mScanCallbackExecutor = executor;
mFrontendInfo = null;
FrameworkStatsLog
.write(FrameworkStatsLog.TV_TUNER_STATE_CHANGED, mUserId, .write(FrameworkStatsLog.TV_TUNER_STATE_CHANGED, mUserId,
FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__SCANNING); FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__SCANNING);
return nativeScan(settings.getType(), settings, scanType); return nativeScan(settings.getType(), settings, scanType);
}
return RESULT_UNAVAILABLE;
} }
return RESULT_UNAVAILABLE;
} }
/** /**
@@ -788,14 +803,15 @@ public class Tuner implements AutoCloseable {
*/ */
@Result @Result
public int cancelScanning() { public int cancelScanning() {
FrameworkStatsLog synchronized (mScanCallbackLock) {
.write(FrameworkStatsLog.TV_TUNER_STATE_CHANGED, mUserId, FrameworkStatsLog.write(FrameworkStatsLog.TV_TUNER_STATE_CHANGED, mUserId,
FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__SCAN_STOPPED); FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__SCAN_STOPPED);
int retVal = nativeStopScan(); int retVal = nativeStopScan();
mScanCallback = null; mScanCallback = null;
mScanCallbackExecutor = null; mScanCallbackExecutor = null;
return retVal; return retVal;
}
} }
private boolean requestFrontend() { private boolean requestFrontend() {
@@ -1050,8 +1066,10 @@ public class Tuner implements AutoCloseable {
private void onFrontendEvent(int eventType) { private void onFrontendEvent(int eventType) {
Log.d(TAG, "Got event from tuning. Event type: " + eventType); Log.d(TAG, "Got event from tuning. Event type: " + eventType);
if (mOnTunerEventExecutor != null && mOnTuneEventListener != null) { synchronized (mOnTuneEventLock) {
mOnTunerEventExecutor.execute(() -> mOnTuneEventListener.onTuneEvent(eventType)); if (mOnTuneEventExecutor != null && mOnTuneEventListener != null) {
mOnTuneEventExecutor.execute(() -> mOnTuneEventListener.onTuneEvent(eventType));
}
} }
Log.d(TAG, "Wrote Stats Log for the events from tuning."); Log.d(TAG, "Wrote Stats Log for the events from tuning.");
@@ -1072,114 +1090,149 @@ public class Tuner implements AutoCloseable {
private void onLocked() { private void onLocked() {
Log.d(TAG, "Wrote Stats Log for locked event from scanning."); Log.d(TAG, "Wrote Stats Log for locked event from scanning.");
FrameworkStatsLog FrameworkStatsLog.write(
.write(FrameworkStatsLog.TV_TUNER_STATE_CHANGED, mUserId, FrameworkStatsLog.TV_TUNER_STATE_CHANGED, mUserId,
FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__LOCKED); FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__LOCKED);
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute(() -> mScanCallback.onLocked()); if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onLocked());
}
} }
} }
private void onScanStopped() { private void onScanStopped() {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute(() -> mScanCallback.onScanStopped()); if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onScanStopped());
}
} }
} }
private void onProgress(int percent) { private void onProgress(int percent) {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute(() -> mScanCallback.onProgress(percent)); if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onProgress(percent));
}
} }
} }
private void onFrequenciesReport(int[] frequency) { private void onFrequenciesReport(int[] frequency) {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute(() -> mScanCallback.onFrequenciesReported(frequency)); if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onFrequenciesReported(frequency));
}
} }
} }
private void onSymbolRates(int[] rate) { private void onSymbolRates(int[] rate) {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute(() -> mScanCallback.onSymbolRatesReported(rate)); if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onSymbolRatesReported(rate));
}
} }
} }
private void onHierarchy(int hierarchy) { private void onHierarchy(int hierarchy) {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute(() -> mScanCallback.onHierarchyReported(hierarchy)); if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onHierarchyReported(hierarchy));
}
} }
} }
private void onSignalType(int signalType) { private void onSignalType(int signalType) {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute(() -> mScanCallback.onSignalTypeReported(signalType)); if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onSignalTypeReported(signalType));
}
} }
} }
private void onPlpIds(int[] plpIds) { private void onPlpIds(int[] plpIds) {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute(() -> mScanCallback.onPlpIdsReported(plpIds)); if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onPlpIdsReported(plpIds));
}
} }
} }
private void onGroupIds(int[] groupIds) { private void onGroupIds(int[] groupIds) {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute(() -> mScanCallback.onGroupIdsReported(groupIds)); if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onGroupIdsReported(groupIds));
}
} }
} }
private void onInputStreamIds(int[] inputStreamIds) { private void onInputStreamIds(int[] inputStreamIds) {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute( if (mScanCallbackExecutor != null && mScanCallback != null) {
() -> mScanCallback.onInputStreamIdsReported(inputStreamIds)); mScanCallbackExecutor.execute(
() -> mScanCallback.onInputStreamIdsReported(inputStreamIds));
}
} }
} }
private void onDvbsStandard(int dvbsStandandard) { private void onDvbsStandard(int dvbsStandandard) {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute( if (mScanCallbackExecutor != null && mScanCallback != null) {
() -> mScanCallback.onDvbsStandardReported(dvbsStandandard)); mScanCallbackExecutor.execute(
() -> mScanCallback.onDvbsStandardReported(dvbsStandandard));
}
} }
} }
private void onDvbtStandard(int dvbtStandard) { private void onDvbtStandard(int dvbtStandard) {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute(() -> mScanCallback.onDvbtStandardReported(dvbtStandard)); if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(
() -> mScanCallback.onDvbtStandardReported(dvbtStandard));
}
} }
} }
private void onAnalogSifStandard(int sif) { private void onAnalogSifStandard(int sif) {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute(() -> mScanCallback.onAnalogSifStandardReported(sif)); if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onAnalogSifStandardReported(sif));
}
} }
} }
private void onAtsc3PlpInfos(Atsc3PlpInfo[] atsc3PlpInfos) { private void onAtsc3PlpInfos(Atsc3PlpInfo[] atsc3PlpInfos) {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute( if (mScanCallbackExecutor != null && mScanCallback != null) {
() -> mScanCallback.onAtsc3PlpInfosReported(atsc3PlpInfos)); mScanCallbackExecutor.execute(
() -> mScanCallback.onAtsc3PlpInfosReported(atsc3PlpInfos));
}
} }
} }
private void onModulationReported(int modulation) { private void onModulationReported(int modulation) {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute( if (mScanCallbackExecutor != null && mScanCallback != null) {
() -> mScanCallback.onModulationReported(modulation)); mScanCallbackExecutor.execute(
() -> mScanCallback.onModulationReported(modulation));
}
} }
} }
private void onPriorityReported(boolean isHighPriority) { private void onPriorityReported(boolean isHighPriority) {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute( if (mScanCallbackExecutor != null && mScanCallback != null) {
() -> mScanCallback.onPriorityReported(isHighPriority)); mScanCallbackExecutor.execute(
() -> mScanCallback.onPriorityReported(isHighPriority));
}
} }
} }
private void onDvbcAnnexReported(int dvbcAnnex) { private void onDvbcAnnexReported(int dvbcAnnex) {
if (mScanCallbackExecutor != null && mScanCallback != null) { synchronized (mScanCallbackLock) {
mScanCallbackExecutor.execute( if (mScanCallbackExecutor != null && mScanCallback != null) {
() -> mScanCallback.onDvbcAnnexReported(dvbcAnnex)); mScanCallbackExecutor.execute(
() -> mScanCallback.onDvbcAnnexReported(dvbcAnnex));
}
} }
} }

13
media/java/android/media/tv/tuner/dvr/DvrPlayback.java
View File

@@ -85,6 +85,7 @@ public class DvrPlayback implements AutoCloseable {
private static int sInstantId = 0; private static int sInstantId = 0;
private int mSegmentId = 0; private int mSegmentId = 0;
private int mUnderflow; private int mUnderflow;
private final Object mListenerLock = new Object();
private native int nativeAttachFilter(Filter filter); private native int nativeAttachFilter(Filter filter);
private native int nativeDetachFilter(Filter filter); private native int nativeDetachFilter(Filter filter);
@@ -106,16 +107,20 @@ public class DvrPlayback implements AutoCloseable {
/** @hide */ /** @hide */
public void setListener( public void setListener(
@NonNull Executor executor, @NonNull OnPlaybackStatusChangedListener listener) { @NonNull Executor executor, @NonNull OnPlaybackStatusChangedListener listener) {
mExecutor = executor; synchronized (mListenerLock) {
mListener = listener; mExecutor = executor;
mListener = listener;
}
} }
private void onPlaybackStatusChanged(int status) { private void onPlaybackStatusChanged(int status) {
if (status == PLAYBACK_STATUS_EMPTY) { if (status == PLAYBACK_STATUS_EMPTY) {
mUnderflow++; mUnderflow++;
} }
if (mExecutor != null && mListener != null) { synchronized (mListenerLock) {
mExecutor.execute(() -> mListener.onPlaybackStatusChanged(status)); if (mExecutor != null && mListener != null) {
mExecutor.execute(() -> mListener.onPlaybackStatusChanged(status));
}
} }
} }

13
media/java/android/media/tv/tuner/dvr/DvrRecorder.java
View File

@@ -48,6 +48,7 @@ public class DvrRecorder implements AutoCloseable {
private int mSegmentId = 0; private int mSegmentId = 0;
private int mOverflow; private int mOverflow;
private Boolean mIsStopped = true; private Boolean mIsStopped = true;
private final Object mListenerLock = new Object();
private native int nativeAttachFilter(Filter filter); private native int nativeAttachFilter(Filter filter);
private native int nativeDetachFilter(Filter filter); private native int nativeDetachFilter(Filter filter);
@@ -69,16 +70,20 @@ public class DvrRecorder implements AutoCloseable {
/** @hide */ /** @hide */
public void setListener( public void setListener(
@NonNull Executor executor, @NonNull OnRecordStatusChangedListener listener) { @NonNull Executor executor, @NonNull OnRecordStatusChangedListener listener) {
mExecutor = executor; synchronized (mListenerLock) {
mListener = listener; mExecutor = executor;
mListener = listener;
}
} }
private void onRecordStatusChanged(int status) { private void onRecordStatusChanged(int status) {
if (status == Filter.STATUS_OVERFLOW) { if (status == Filter.STATUS_OVERFLOW) {
mOverflow++; mOverflow++;
} }
if (mExecutor != null && mListener != null) { synchronized (mListenerLock) {
mExecutor.execute(() -> mListener.onRecordStatusChanged(status)); if (mExecutor != null && mListener != null) {
mExecutor.execute(() -> mListener.onRecordStatusChanged(status));
}
} }
} }

23
media/java/android/media/tv/tuner/filter/Filter.java
View File

@@ -227,6 +227,7 @@ public class Filter implements AutoCloseable {
private long mNativeContext; private long mNativeContext;
private FilterCallback mCallback; private FilterCallback mCallback;
private Executor mExecutor; private Executor mExecutor;
private final Object mCallbackLock = new Object();
private final long mId; private final long mId;
private int mMainType; private int mMainType;
private int mSubtype; private int mSubtype;
@@ -253,14 +254,18 @@ public class Filter implements AutoCloseable {
} }
private void onFilterStatus(int status) { private void onFilterStatus(int status) {
if (mCallback != null && mExecutor != null) { synchronized (mCallbackLock) {
mExecutor.execute(() -> mCallback.onFilterStatusChanged(this, status)); if (mCallback != null && mExecutor != null) {
mExecutor.execute(() -> mCallback.onFilterStatusChanged(this, status));
}
} }
} }
private void onFilterEvent(FilterEvent[] events) { private void onFilterEvent(FilterEvent[] events) {
if (mCallback != null && mExecutor != null) { synchronized (mCallbackLock) {
mExecutor.execute(() -> mCallback.onFilterEvent(this, events)); if (mCallback != null && mExecutor != null) {
mExecutor.execute(() -> mCallback.onFilterEvent(this, events));
}
} }
} }
@@ -272,13 +277,17 @@ public class Filter implements AutoCloseable {
/** @hide */ /** @hide */
public void setCallback(FilterCallback cb, Executor executor) { public void setCallback(FilterCallback cb, Executor executor) {
mCallback = cb; synchronized (mCallbackLock) {
mExecutor = executor; mCallback = cb;
mExecutor = executor;
}
} }
/** @hide */ /** @hide */
public FilterCallback getCallback() { public FilterCallback getCallback() {
return mCallback; synchronized (mCallbackLock) {
return mCallback;
}
} }
/** /**