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

Commit 0eff5503 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix tuner API review comments."

parents 72fe1d3a 83088b72

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -6480,7 +6480,7 @@ package android.media.tv.tuner { 
    method public int getAvSyncHwId(@NonNull android.media.tv.tuner.filter.Filter);

    method public long getAvSyncTime(int);

    method @Nullable public java.util.List<android.media.tv.tuner.frontend.FrontendInfo> getAvailableFrontendInfos();

    method @Nullable public String getCurrentFrontendHardwardInfo();

    method @Nullable public String getCurrentFrontendHardwareInfo();

    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[]);
@@ -7930,7 +7930,7 @@ package android.media.tv.tuner.frontend { 
    method public void onScanStopped();

    method public void onSignalTypeReported(int);

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

    method public default void onUnLocked();

    method public default void onUnlocked();

  }















}

























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



+3
−3




























Original line number
Diff line number
Diff line








@@ -1294,7 +1294,7 @@ public class Tuner implements AutoCloseable  {













     * @throws IllegalStateException if there is no active frontend currently.















     */















    @Nullable













    public String getCurrentFrontendHardwardInfo() {













    public String getCurrentFrontendHardwareInfo() {















        mFrontendLock.lock();















        try {















            if (!TunerVersionChecker.checkHigherOrEqualVersionTo(










@@ -1434,7 +1434,7 @@ public class Tuner implements AutoCloseable  {













        }















    }





























    private void onUnLocked() {













    private void onUnlocked() {















        Log.d(TAG, "Wrote Stats Log for unlocked event from scanning.");















        FrameworkStatsLog.write(FrameworkStatsLog.TV_TUNER_STATE_CHANGED, mUserId,















                FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__LOCKED);









@@ -1444,7 +1444,7 @@ public class Tuner implements AutoCloseable  {













                mScanCallbackExecutor.execute(() -> {















                    synchronized (mScanCallbackLock) {















                        if (mScanCallback != null) {













                            mScanCallback.onUnLocked();













                            mScanCallback.onUnlocked();















                        }















                    }















                });

































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



+1
−1




























Original line number
Diff line number
Diff line








@@ -37,7 +37,7 @@ public interface ScanCallback {













    void onLocked();































    /** Scan unlocked the signal. */













    default void onUnLocked() {}













    default void onUnlocked() {}































    /** Scan stopped. */















    void onScanStopped();

































media/jni/android_media_tv_Tuner.cpp



+1
−1




























Original line number
Diff line number
Diff line








@@ -1044,7 +1044,7 @@ void FrontendClientCallbackImpl::executeOnScanMessage(













            } else {















                env->CallVoidMethod(















                        frontend,













                        env->GetMethodID(clazz, "onUnLocked", "()V"));













                        env->GetMethodID(clazz, "onUnlocked", "()V"));















            }















            break;















        }