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

Commit e33b2810 authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add onDvbcAnnexReported ScanCallback"

parents 2ab8f9ff b17f8498

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6353,6 +6353,7 @@ package android.media.tv.tuner.frontend { 
  public interface ScanCallback {

    method public void onAnalogSifStandardReported(int);

    method public void onAtsc3PlpInfosReported(@NonNull android.media.tv.tuner.frontend.Atsc3PlpInfo[]);

    method public default void onDvbcAnnexReported(int);

    method public void onDvbsStandardReported(int);

    method public void onDvbtStandardReported(int);

    method public void onFrequenciesReported(@NonNull int[]);

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6293,6 +6293,7 @@ package android.media.tv.tuner.frontend { 
  public interface ScanCallback {

    method public void onAnalogSifStandardReported(int);

    method public void onAtsc3PlpInfosReported(@NonNull android.media.tv.tuner.frontend.Atsc3PlpInfo[]);

    method public default void onDvbcAnnexReported(int);

    method public void onDvbsStandardReported(int);

    method public void onDvbtStandardReported(int);

    method public void onFrequenciesReported(@NonNull int[]);

media/java/android/media/tv/tuner/Tuner.java

+7 −0
Original line number Diff line number Diff line
@@ -1062,6 +1062,13 @@ public class Tuner implements AutoCloseable { 
        }

    }



    private void onDvbcAnnexReported(int dvbcAnnex) {

        if (mScanCallbackExecutor != null && mScanCallback != null) {

            mScanCallbackExecutor.execute(

                    () -> mScanCallback.onDvbcAnnexReported(dvbcAnnex));

        }

    }



    /**

     * Opens a filter object based on the given types and buffer size.

     *

media/java/android/media/tv/tuner/frontend/ScanCallback.java

+3 −0
Original line number Diff line number Diff line
@@ -75,4 +75,7 @@ public interface ScanCallback { 


    /** Frontend scan message priority reported. */

    default void onPriorityReported(boolean isHighPriority) {}



    /** DVBC Frontend Annex reported. */

    default void onDvbcAnnexReported(@DvbcFrontendSettings.Annex int dvbcAnnex) {}

}

media/jni/android_media_tv_Tuner.cpp

+9 −1
Original line number Diff line number Diff line
@@ -1058,10 +1058,18 @@ Return<void> FrontendCallback::onScanMessageExt1_1(FrontendScanMessageTypeExt1_1 
            bool isHighPriority = message.isHighPriority();

            env->CallVoidMethod(

                    mObject,

                    env->GetMethodID(clazz, "onPriorityReported", "([B)V"),

                    env->GetMethodID(clazz, "onPriorityReported", "(B)V"),

                    isHighPriority);

            break;

        }

        case FrontendScanMessageTypeExt1_1::DVBC_ANNEX: {

            jint dvbcAnnex = (jint) message.annex();

            env->CallVoidMethod(

                    mObject,

                    env->GetMethodID(clazz, "onDvbcAnnexReported", "(I)V"),

                    dvbcAnnex);

            break;

        }

        default:

            break;

    }