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

Merge "Only allow RecordDVR to flush buffer when the DVR is stopped" am: 30e3efaaa5 am: 6c28ea88e5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84ee8ce707bb48ec12bb453200eaeec1c5244ed4
This commit is contained in:
Amy Zhang
2021-01-20 22:13:11 +00:00
committed by Automerger Merge Worker
parent 396957acad 6c28ea88e5
commit ff5d180dd6
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,7 @@ public class DvrRecorder implements AutoCloseable {
private static int sInstantId = 0;
private int mSegmentId = 0;
private int mOverflow;
private Boolean mIsStopped = null;
private native int nativeAttachFilter(Filter filter);
private native int nativeDetachFilter(Filter filter);
@@ -135,7 +136,13 @@ public class DvrRecorder implements AutoCloseable {
.write(FrameworkStatsLog.TV_TUNER_DVR_STATUS, mUserId,
FrameworkStatsLog.TV_TUNER_DVR_STATUS__TYPE__RECORD,
FrameworkStatsLog.TV_TUNER_DVR_STATUS__STATE__STARTED, mSegmentId, 0);
return nativeStartDvr();
synchronized (mIsStopped) {
int result = nativeStartDvr();
if (result == Tuner.RESULT_SUCCESS) {
mIsStopped = false;
}
return result;
}
}
/**
@@ -152,7 +159,13 @@ public class DvrRecorder implements AutoCloseable {
.write(FrameworkStatsLog.TV_TUNER_DVR_STATUS, mUserId,
FrameworkStatsLog.TV_TUNER_DVR_STATUS__TYPE__RECORD,
FrameworkStatsLog.TV_TUNER_DVR_STATUS__STATE__STOPPED, mSegmentId, mOverflow);
return nativeStopDvr();
synchronized (mIsStopped) {
int result = nativeStopDvr();
if (result == Tuner.RESULT_SUCCESS) {
mIsStopped = true;
}
return result;
}
}
/**
@@ -164,7 +177,13 @@ public class DvrRecorder implements AutoCloseable {
*/
@Result
public int flush() {
return nativeFlushDvr();
synchronized (mIsStopped) {
if (mIsStopped) {
return nativeFlushDvr();
}
Log.w(TAG, "Cannot flush non-stopped Record DVR.");
return Tuner.RESULT_INVALID_STATE;
}
}
/**