Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b295b957 authored by shubang's avatar shubang
Browse files

API review: rename onAdBuffer 

Fix: 268487799
Test: atest TvInteractiveAppServiceTest#testNotifyAdBufferReady
Change-Id: Ie21a7acce320e766f488bc361a0363444334e3aa
parent cb10ef04

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -27404,7 +27404,7 @@ package android.media.tv { 
    method public void notifyTvMessage(@NonNull String, @NonNull android.os.Bundle);

    method public void notifyVideoAvailable();

    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 android.view.View onCreateOverlayView();

    method public boolean onGenericMotionEvent(android.view.MotionEvent);
@@ -27715,7 +27715,7 @@ package android.media.tv.interactive { 
    ctor public TvInteractiveAppService.Session(@NonNull android.content.Context);

    method public boolean isMediaViewEnabled();

    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 void notifySessionStateChanged(int, int);

    method @CallSuper public final void notifyTeletextAppStateChanged(int);

media/java/android/media/tv/ITvInputManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ interface ITvInputManager { 


    // For ad request

    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

    void notifyTvMessage(in IBinder sessionToken, in String type, in Bundle data, int userId);

media/java/android/media/tv/ITvInputSession.aidl

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ oneway interface ITvInputSession { 


    // For ad request

    void requestAd(in AdRequest request);

    void notifyAdBuffer(in AdBuffer buffer);

    void notifyAdBufferReady(in AdBuffer buffer);



    // For TV messages

    void notifyTvMessage(in String type, in Bundle data);

media/java/android/media/tv/ITvInputSessionWrapper.java

+2 −2
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand 
                break;

            }

            case DO_NOTIFY_AD_BUFFER: {

                mTvInputSessionImpl.notifyAdBuffer((AdBuffer) msg.obj);

                mTvInputSessionImpl.notifyAdBufferReady((AdBuffer) msg.obj);

                break;

            }

            case DO_NOTIFY_TV_MESSAGE: {
@@ -465,7 +465,7 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand 
    }



    @Override

    public void notifyAdBuffer(AdBuffer buffer) {

    public void notifyAdBufferReady(AdBuffer buffer) {

        mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_NOTIFY_AD_BUFFER, buffer));

    }

media/java/android/media/tv/TvInputManager.java

+2 −2
Original line number Diff line number Diff line
@@ -3642,13 +3642,13 @@ public final class TvInputManager { 
        /**

         * 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) {

                Log.w(TAG, "The session has been already released");

                return;

            }

            try {

                mService.notifyAdBuffer(mToken, buffer, mUserId);

                mService.notifyAdBufferReady(mToken, buffer, mUserId);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }