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

Commit 9fa4f6fe authored by shubang's avatar shubang
Browse files

Unhide Frontend related methods in Tuner.java 

Test: make;
Bug: 139308734
Change-Id: I1cb68c6e8915091509765bcc3ffcd875480caf31
parent d63e313e

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -4730,6 +4730,8 @@ package android.media.tv.tuner { 
  public final class Tuner implements java.lang.AutoCloseable {

    ctor public Tuner(@NonNull android.content.Context);

    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void clearOnTuneEventListener();

    method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public android.media.tv.tuner.frontend.FrontendInfo getFrontendInfo();

    method @Nullable public android.media.tv.tuner.frontend.FrontendStatus getFrontendStatus(@NonNull int[]);

    method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public android.media.tv.tuner.Tuner.Descrambler openDescrambler();

    method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public android.media.tv.tuner.dvr.DvrPlayback openDvrPlayback(long, @Nullable java.util.concurrent.Executor, @Nullable android.media.tv.tuner.dvr.OnPlaybackStatusChangedListener);

    method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public android.media.tv.tuner.dvr.DvrRecorder openDvrRecorder(long, @Nullable java.util.concurrent.Executor, @Nullable android.media.tv.tuner.dvr.OnRecordStatusChangedListener);
@@ -4738,6 +4740,7 @@ package android.media.tv.tuner { 
    method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public android.media.tv.tuner.Lnb openLnbByName(@Nullable String, @Nullable java.util.concurrent.Executor, @NonNull android.media.tv.tuner.LnbCallback);

    method @Nullable public android.media.tv.tuner.filter.TimeFilter openTimeFilter();

    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int scan(@NonNull android.media.tv.tuner.frontend.FrontendSettings, int, @NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.frontend.ScanCallback);

    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int setLna(boolean);

    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void setOnTuneEventListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.frontend.OnTuneEventListener);

    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int stopScan();

    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int stopTune();

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

+4 −27
Original line number Diff line number Diff line
@@ -269,8 +269,8 @@ public final class Tuner implements AutoCloseable { 
     * start a new tuning.

     *

     * <p>

     * Tune is an async call, with {@link OnTuneEventListener#LOCKED LOCKED} and {@link

     * OnTuneEventListener#NO_SIGNAL NO_SIGNAL} events sent to the {@link OnTuneEventListener}

     * Tune is an async call, with {@link OnTuneEventListener#SIGNAL_LOCKED} and {@link

     * OnTuneEventListener#SIGNAL_NO_SIGNAL} events sent to the {@link OnTuneEventListener}

     * specified in {@link #setOnTuneEventListener(Executor, OnTuneEventListener)}.

     *

     * @param settings Signal delivery information the frontend uses to
@@ -357,13 +357,9 @@ public final class Tuner implements AutoCloseable { 
     * @param lnb the LNB instance.

     *

     * @return result status of the operation.

     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER)

    @Result

    public int setLnb(@NonNull Lnb lnb) {

        TunerUtils.checkTunerPermission(mContext);

    private int setLnb(@NonNull Lnb lnb) {

        return nativeSetLnb(lnb.mId);

    }
@@ -373,8 +369,6 @@ public final class Tuner implements AutoCloseable { 
     * @param enable {@code true} to activate LNA module; {@code false} to deactivate LNA.

     *

     * @return result status of the operation.

     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER)

    @Result
@@ -390,10 +384,9 @@ public final class Tuner implements AutoCloseable { 
     *

     * @param statusTypes an array of status types which the caller requests.

     * @return statuses which response the caller's requests.

     * @hide

     */

    @Nullable

    public FrontendStatus getFrontendStatus(int[] statusTypes) {

    public FrontendStatus getFrontendStatus(@NonNull int[] statusTypes) {

        return nativeGetFrontendStatus(statusTypes);

    }
@@ -466,8 +459,6 @@ public final class Tuner implements AutoCloseable { 
     * Gets the frontend information.

     *

     * @return The frontend information. {@code null} if the operation failed.

     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER)

    @Nullable
@@ -479,20 +470,6 @@ public final class Tuner implements AutoCloseable { 
        return nativeGetFrontendInfo(mFrontend.mId);

    }



    /**

     * Gets the frontend ID.

     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER)

    public int getFrontendId() {

        TunerUtils.checkTunerPermission(mContext);

        if (mFrontend == null) {

            throw new IllegalStateException("frontend is not initialized");

        }

        return mFrontend.mId;

    }



    /**

     * Gets Demux capabilities.

     *