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

[TIAF] Dup AdBuffer early to avoid race conditions

Browse Source 
If we dup the buffer in the main thread, it's possible that the buffer has been released and is no longer valid.

Bug: 280886498
Test: atest TvInteractiveAppServiceTest#testNotifyAdBufferReady
Change-Id: I7f07f4ab42f59c2cf91d47d1dd8a8aca93ae70d2
This commit is contained in:
shubang
2023-05-24 16:49:45 -07:00
committed by Shubang Lu
parent 75faf08349
commit f01fe42841
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.util.Preconditions;
import java.io.IOException;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
@@ -1009,6 +1010,13 @@ public abstract class TvInputService extends Service {
* @param buffer the {@link AdBuffer} that was consumed.
*/
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() {
@MainThread
@Override
@@ -1016,10 +1024,14 @@ public abstract class TvInputService extends Service {
try {
if (DEBUG) Log.d(TAG, "notifyAdBufferConsumed");
if (mSessionCallback != null) {
mSessionCallback.onAdBufferConsumed(buffer);
mSessionCallback.onAdBufferConsumed(dupBuffer);
}
} catch (RemoteException 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
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() {
@MainThread
@Override
@@ -1974,10 +1981,14 @@ public abstract class TvInteractiveAppService extends Service {
"notifyAdBufferReady(buffer=" + buffer + ")");
}
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);
} finally {
if (dupBuffer != null) {
dupBuffer.getSharedMemory().close();
}
}
}
});