Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix tuner API review comments."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-01-06 04:57:09 +00:00
committed by Android (Google) Code Review
parent 72fe1d3a43 83088b7229
commit 0eff5503f5
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/system-current.txt
View File

@@ -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();
}
}

6
media/java/android/media/tv/tuner/Tuner.java
View File

@@ -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();
}
}
});

2
media/java/android/media/tv/tuner/frontend/ScanCallback.java
View File

@@ -37,7 +37,7 @@ public interface ScanCallback {
void onLocked();
/** Scan unlocked the signal. */
default void onUnLocked() {}
default void onUnlocked() {}
/** Scan stopped. */
void onScanStopped();

2
media/jni/android_media_tv_Tuner.cpp
View File

@@ -1044,7 +1044,7 @@ void FrontendClientCallbackImpl::executeOnScanMessage(
} else {
env->CallVoidMethod(
frontend,
env->GetMethodID(clazz, "onUnLocked", "()V"));
env->GetMethodID(clazz, "onUnlocked", "()V"));
}
break;
}