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

Merge "[TIAF] Dup AdBuffer early to avoid race conditions" into udc-dev

Browse Source
This commit is contained in:
Shubang Lu
2023-05-26 00:57:24 +00:00
committed by Android (Google) Code Review
parent 4a3d7406f7 f01fe42841
commit 3e143396ac
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
media/java/android/media/tv/TvInputService.java
View File

@@ -63,6 +63,7 @@ import android.widget.FrameLayout;
import com.android.internal.os.SomeArgs; import com.android.internal.os.SomeArgs;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
import java.io.IOException;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
@@ -1009,6 +1010,13 @@ public abstract class TvInputService extends Service {
* @param buffer the {@link AdBuffer} that was consumed. * @param buffer the {@link AdBuffer} that was consumed.
*/ */
public void notifyAdBufferConsumed(@NonNull AdBuffer buffer) { public void notifyAdBufferConsumed(@NonNull AdBuffer buffer) {
AdBuffer dupBuffer;
try {
dupBuffer = AdBuffer.dupAdBuffer(buffer);
} catch (IOException e) {
Log.w(TAG, "dup AdBuffer error in notifyAdBufferConsumed:", e);
return;
}
executeOrPostRunnableOnMainThread(new Runnable() { executeOrPostRunnableOnMainThread(new Runnable() {
@MainThread @MainThread
@Override @Override
@@ -1016,10 +1024,14 @@ public abstract class TvInputService extends Service {
try { try {
if (DEBUG) Log.d(TAG, "notifyAdBufferConsumed"); if (DEBUG) Log.d(TAG, "notifyAdBufferConsumed");
if (mSessionCallback != null) { if (mSessionCallback != null) {
mSessionCallback.onAdBufferConsumed(buffer); mSessionCallback.onAdBufferConsumed(dupBuffer);
} }
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(TAG, "error in notifyAdBufferConsumed", e); Log.w(TAG, "error in notifyAdBufferConsumed", e);
} finally {
if (dupBuffer != null) {
dupBuffer.getSharedMemory().close();
}
} }
} }
}); });

15
media/java/android/media/tv/interactive/TvInteractiveAppService.java
View File

@@ -1964,6 +1964,13 @@ public abstract class TvInteractiveAppService extends Service {
*/ */
@CallSuper @CallSuper
public void notifyAdBufferReady(@NonNull AdBuffer buffer) { public void notifyAdBufferReady(@NonNull AdBuffer buffer) {
AdBuffer dupBuffer;
try {
dupBuffer = AdBuffer.dupAdBuffer(buffer);
} catch (IOException e) {
Log.w(TAG, "dup AdBuffer error in notifyAdBufferReady:", e);
return;
}
executeOrPostRunnableOnMainThread(new Runnable() { executeOrPostRunnableOnMainThread(new Runnable() {
@MainThread @MainThread
@Override @Override
@@ -1974,10 +1981,14 @@ public abstract class TvInteractiveAppService extends Service {
"notifyAdBufferReady(buffer=" + buffer + ")"); "notifyAdBufferReady(buffer=" + buffer + ")");
} }
if (mSessionCallback != null) { if (mSessionCallback != null) {
mSessionCallback.onAdBufferReady(AdBuffer.dupAdBuffer(buffer)); mSessionCallback.onAdBufferReady(dupBuffer);
} }
} catch (RemoteException | IOException e) { } catch (RemoteException e) {
Log.w(TAG, "error in notifyAdBuffer", e); Log.w(TAG, "error in notifyAdBuffer", e);
} finally {
if (dupBuffer != null) {
dupBuffer.getSharedMemory().close();
}
} }
} }
}); });