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

Commit 9d04cb7d authored by Kensuke Miyagi's avatar Kensuke Miyagi Committed by Android (Google) Code Review
Browse files

Merge "Add @RequiresPermission to tuner resource inquery APIs"

parents 989cc836 f2b43bc5

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -6117,7 +6117,7 @@ package android.media.tv.tuner { 
    method @Nullable public android.media.tv.tuner.DemuxCapabilities getDemuxCapabilities();

    method @Nullable public android.media.tv.tuner.frontend.FrontendInfo getFrontendInfo();

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

    method public boolean hasUnusedFrontend(int);

    method @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public boolean hasUnusedFrontend(int);

    method public boolean isLowestPriority(int);

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

    method @Nullable public android.media.tv.tuner.dvr.DvrPlayback openDvrPlayback(long, @NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.dvr.OnPlaybackStatusChangedListener);
@@ -6132,7 +6132,7 @@ package android.media.tv.tuner { 
    method public void setResourceLostListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.Tuner.OnResourceLostListener);

    method public void shareFrontendFromTuner(@NonNull android.media.tv.tuner.Tuner);

    method public int tune(@NonNull android.media.tv.tuner.frontend.FrontendSettings);

    method public void updateResourcePriority(int, int);

    method @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public void updateResourcePriority(int, int);

    field public static final int INVALID_AV_SYNC_ID = -1; // 0xffffffff

    field public static final int INVALID_FILTER_ID = -1; // 0xffffffff

    field public static final long INVALID_FILTER_ID_LONG = -1L; // 0xffffffffffffffffL

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

+2 −0
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ public class Tuner implements AutoCloseable { 
     *                 and the API would only process nice value setting in that case.

     * @param niceValue the nice value.

     */

    @RequiresPermission(android.Manifest.permission.TUNER_RESOURCE_ACCESS)

    public void updateResourcePriority(int priority, int niceValue) {

        mTunerResourceManager.updateClientPriority(mClientId, priority, niceValue);

    }
@@ -455,6 +456,7 @@ public class Tuner implements AutoCloseable { 
     * @param frontendType {@link android.media.tv.tuner.frontend.FrontendSettings.Type} for the

     * query to be done for.

     */

    @RequiresPermission(android.Manifest.permission.TUNER_RESOURCE_ACCESS)

    public boolean hasUnusedFrontend(int frontendType) {

        return mTunerResourceManager.hasUnusedFrontend(frontendType);

    }