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

Merge "API review: rename onAdBuffer" into udc-dev

Browse Source
This commit is contained in:
Shubang Lu
2023-03-09 01:34:50 +00:00
committed by Android (Google) Code Review
parent fa47292de4 b295b95726
commit 26ccbdf9d0
12 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -27432,7 +27432,7 @@ package android.media.tv {
method public void notifyTvMessage(@NonNull String, @NonNull android.os.Bundle); method public void notifyTvMessage(@NonNull String, @NonNull android.os.Bundle);
method public void notifyVideoAvailable(); method public void notifyVideoAvailable();
method public void notifyVideoUnavailable(int); method public void notifyVideoUnavailable(int);
method public void onAdBuffer(@NonNull android.media.tv.AdBuffer); method public void onAdBufferReady(@NonNull android.media.tv.AdBuffer);
method public void onAppPrivateCommand(@NonNull String, android.os.Bundle); method public void onAppPrivateCommand(@NonNull String, android.os.Bundle);
method public android.view.View onCreateOverlayView(); method public android.view.View onCreateOverlayView();
method public boolean onGenericMotionEvent(android.view.MotionEvent); method public boolean onGenericMotionEvent(android.view.MotionEvent);
@@ -27743,7 +27743,7 @@ package android.media.tv.interactive {
ctor public TvInteractiveAppService.Session(@NonNull android.content.Context); ctor public TvInteractiveAppService.Session(@NonNull android.content.Context);
method public boolean isMediaViewEnabled(); method public boolean isMediaViewEnabled();
method @CallSuper public void layoutSurface(int, int, int, int); method @CallSuper public void layoutSurface(int, int, int, int);
method @CallSuper public void notifyAdBuffer(@NonNull android.media.tv.AdBuffer); method @CallSuper public void notifyAdBufferReady(@NonNull android.media.tv.AdBuffer);
method @CallSuper public final void notifyBiInteractiveAppCreated(@NonNull android.net.Uri, @Nullable String); method @CallSuper public final void notifyBiInteractiveAppCreated(@NonNull android.net.Uri, @Nullable String);
method @CallSuper public void notifySessionStateChanged(int, int); method @CallSuper public void notifySessionStateChanged(int, int);
method @CallSuper public final void notifyTeletextAppStateChanged(int); method @CallSuper public final void notifyTeletextAppStateChanged(int);

2
media/java/android/media/tv/ITvInputManager.aidl
View File

@@ -116,7 +116,7 @@ interface ITvInputManager {
// For ad request // For ad request
void requestAd(in IBinder sessionToken, in AdRequest request, int userId); void requestAd(in IBinder sessionToken, in AdRequest request, int userId);
void notifyAdBuffer(in IBinder sessionToken, in AdBuffer buffer, int userId); void notifyAdBufferReady(in IBinder sessionToken, in AdBuffer buffer, int userId);
// For TV Message // For TV Message
void notifyTvMessage(in IBinder sessionToken, in String type, in Bundle data, int userId); void notifyTvMessage(in IBinder sessionToken, in String type, in Bundle data, int userId);

2
media/java/android/media/tv/ITvInputSession.aidl
View File

@@ -75,7 +75,7 @@ oneway interface ITvInputSession {
// For ad request // For ad request
void requestAd(in AdRequest request); void requestAd(in AdRequest request);
void notifyAdBuffer(in AdBuffer buffer); void notifyAdBufferReady(in AdBuffer buffer);
// For TV messages // For TV messages
void notifyTvMessage(in String type, in Bundle data); void notifyTvMessage(in String type, in Bundle data);

4
media/java/android/media/tv/ITvInputSessionWrapper.java
View File

@@ -275,7 +275,7 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand
break; break;
} }
case DO_NOTIFY_AD_BUFFER: { case DO_NOTIFY_AD_BUFFER: {
mTvInputSessionImpl.notifyAdBuffer((AdBuffer) msg.obj); mTvInputSessionImpl.notifyAdBufferReady((AdBuffer) msg.obj);
break; break;
} }
case DO_NOTIFY_TV_MESSAGE: { case DO_NOTIFY_TV_MESSAGE: {
@@ -465,7 +465,7 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand
} }
@Override @Override
public void notifyAdBuffer(AdBuffer buffer) { public void notifyAdBufferReady(AdBuffer buffer) {
mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_NOTIFY_AD_BUFFER, buffer)); mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_NOTIFY_AD_BUFFER, buffer));
} }

4
media/java/android/media/tv/TvInputManager.java
View File

@@ -3642,13 +3642,13 @@ public final class TvInputManager {
/** /**
* Notifies when the advertisement buffer is filled and ready to be read. * Notifies when the advertisement buffer is filled and ready to be read.
*/ */
public void notifyAdBuffer(AdBuffer buffer) { public void notifyAdBufferReady(AdBuffer buffer) {
if (mToken == null) { if (mToken == null) {
Log.w(TAG, "The session has been already released"); Log.w(TAG, "The session has been already released");
return; return;
} }
try { try {
mService.notifyAdBuffer(mToken, buffer, mUserId); mService.notifyAdBufferReady(mToken, buffer, mUserId);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }

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

@@ -1351,7 +1351,7 @@ public abstract class TvInputService extends Service {
* *
* @param buffer The {@link AdBuffer} that became ready for playback. * @param buffer The {@link AdBuffer} that became ready for playback.
*/ */
public void onAdBuffer(@NonNull AdBuffer buffer) { public void onAdBufferReady(@NonNull AdBuffer buffer) {
} }
/** /**
@@ -2050,8 +2050,8 @@ public abstract class TvInputService extends Service {
onRequestAd(request); onRequestAd(request);
} }
void notifyAdBuffer(AdBuffer buffer) { void notifyAdBufferReady(AdBuffer buffer) {
onAdBuffer(buffer); onAdBufferReady(buffer);
} }
void onTvMessageReceived(String type, Bundle data) { void onTvMessageReceived(String type, Bundle data) {

2
media/java/android/media/tv/interactive/ITvInteractiveAppClient.aidl
View File

@@ -39,7 +39,7 @@ oneway interface ITvInteractiveAppClient {
void onSessionStateChanged(int state, int err, int seq); void onSessionStateChanged(int state, int err, int seq);
void onBiInteractiveAppCreated(in Uri biIAppUri, in String biIAppId, int seq); void onBiInteractiveAppCreated(in Uri biIAppUri, in String biIAppId, int seq);
void onTeletextAppStateChanged(int state, int seq); void onTeletextAppStateChanged(int state, int seq);
void onAdBuffer(in AdBuffer buffer, int seq); void onAdBufferReady(in AdBuffer buffer, int seq);
void onCommandRequest(in String cmdType, in Bundle parameters, int seq); void onCommandRequest(in String cmdType, in Bundle parameters, int seq);
void onTimeShiftCommandRequest(in String cmdType, in Bundle parameters, int seq); void onTimeShiftCommandRequest(in String cmdType, in Bundle parameters, int seq);
void onSetVideoBounds(in Rect rect, int seq); void onSetVideoBounds(in Rect rect, int seq);

2
media/java/android/media/tv/interactive/ITvInteractiveAppSessionCallback.aidl
View File

@@ -38,7 +38,7 @@ oneway interface ITvInteractiveAppSessionCallback {
void onSessionStateChanged(int state, int err); void onSessionStateChanged(int state, int err);
void onBiInteractiveAppCreated(in Uri biIAppUri, in String biIAppId); void onBiInteractiveAppCreated(in Uri biIAppUri, in String biIAppId);
void onTeletextAppStateChanged(int state); void onTeletextAppStateChanged(int state);
void onAdBuffer(in AdBuffer buffer); void onAdBufferReady(in AdBuffer buffer);
void onCommandRequest(in String cmdType, in Bundle parameters); void onCommandRequest(in String cmdType, in Bundle parameters);
void onTimeShiftCommandRequest(in String cmdType, in Bundle parameters); void onTimeShiftCommandRequest(in String cmdType, in Bundle parameters);
void onSetVideoBounds(in Rect rect); void onSetVideoBounds(in Rect rect);

8
media/java/android/media/tv/interactive/TvInteractiveAppManager.java
View File

@@ -681,14 +681,14 @@ public final class TvInteractiveAppManager {
} }
@Override @Override
public void onAdBuffer(AdBuffer buffer, int seq) { public void onAdBufferReady(AdBuffer buffer, int seq) {
synchronized (mSessionCallbackRecordMap) { synchronized (mSessionCallbackRecordMap) {
SessionCallbackRecord record = mSessionCallbackRecordMap.get(seq); SessionCallbackRecord record = mSessionCallbackRecordMap.get(seq);
if (record == null) { if (record == null) {
Log.e(TAG, "Callback not found for seq " + seq); Log.e(TAG, "Callback not found for seq " + seq);
return; return;
} }
record.postAdBuffer(buffer); record.postAdBufferReady(buffer);
} }
} }
}; };
@@ -2245,12 +2245,12 @@ public final class TvInteractiveAppManager {
}); });
} }
void postAdBuffer(AdBuffer buffer) { void postAdBufferReady(AdBuffer buffer) {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mSession.getInputSession() != null) { if (mSession.getInputSession() != null) {
mSession.getInputSession().notifyAdBuffer(buffer); mSession.getInputSession().notifyAdBufferReady(buffer);
} }
} }
}); });

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

@@ -1941,7 +1941,7 @@ public abstract class TvInteractiveAppService extends Service {
* @param buffer The {@link AdBuffer} to be received * @param buffer The {@link AdBuffer} to be received
*/ */
@CallSuper @CallSuper
public void notifyAdBuffer(@NonNull AdBuffer buffer) { public void notifyAdBufferReady(@NonNull AdBuffer buffer) {
executeOrPostRunnableOnMainThread(new Runnable() { executeOrPostRunnableOnMainThread(new Runnable() {
@MainThread @MainThread
@Override @Override
@@ -1949,10 +1949,10 @@ public abstract class TvInteractiveAppService extends Service {
try { try {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, Log.d(TAG,
"notifyAdBuffer(buffer=" + buffer + ")"); "notifyAdBufferReady(buffer=" + buffer + ")");
} }
if (mSessionCallback != null) { if (mSessionCallback != null) {
mSessionCallback.onAdBuffer(buffer); mSessionCallback.onAdBufferReady(buffer);
} }
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(TAG, "error in notifyAdBuffer", e); Log.w(TAG, "error in notifyAdBuffer", e);

4
services/core/java/com/android/server/tv/TvInputManagerService.java
View File

@@ -2590,7 +2590,7 @@ public final class TvInputManagerService extends SystemService {
} }
@Override @Override
public void notifyAdBuffer( public void notifyAdBufferReady(
IBinder sessionToken, AdBuffer buffer, int userId) { IBinder sessionToken, AdBuffer buffer, int userId) {
final int callingUid = Binder.getCallingUid(); final int callingUid = Binder.getCallingUid();
final int callingPid = Binder.getCallingPid(); final int callingPid = Binder.getCallingPid();
@@ -2602,7 +2602,7 @@ public final class TvInputManagerService extends SystemService {
try { try {
SessionState sessionState = getSessionStateLocked(sessionToken, callingUid, SessionState sessionState = getSessionStateLocked(sessionToken, callingUid,
resolvedUserId); resolvedUserId);
getSessionLocked(sessionState).notifyAdBuffer(buffer); getSessionLocked(sessionState).notifyAdBufferReady(buffer);
} catch (RemoteException | SessionNotFoundException e) { } catch (RemoteException | SessionNotFoundException e) {
Slog.e(TAG, "error in notifyAdBuffer", e); Slog.e(TAG, "error in notifyAdBuffer", e);
} }

6
services/core/java/com/android/server/tv/interactive/TvInteractiveAppManagerService.java
View File

@@ -3047,16 +3047,16 @@ public class TvInteractiveAppManagerService extends SystemService {
} }
@Override @Override
public void onAdBuffer(AdBuffer buffer) { public void onAdBufferReady(AdBuffer buffer) {
synchronized (mLock) { synchronized (mLock) {
if (DEBUG) { if (DEBUG) {
Slogf.d(TAG, "onAdBuffer(buffer=" + buffer + ")"); Slogf.d(TAG, "onAdBufferReady(buffer=" + buffer + ")");
} }
if (mSessionState.mSession == null || mSessionState.mClient == null) { if (mSessionState.mSession == null || mSessionState.mClient == null) {
return; return;
} }
try { try {
mSessionState.mClient.onAdBuffer(buffer, mSessionState.mSeq); mSessionState.mClient.onAdBufferReady(buffer, mSessionState.mSeq);
} catch (RemoteException e) { } catch (RemoteException e) {
Slogf.e(TAG, "error in onAdBuffer", e); Slogf.e(TAG, "error in onAdBuffer", e);
} }