From 83088b7229151b5b1f47f818f78a38a4e37e2b37 Mon Sep 17 00:00:00 2001
From: Hongguang <hgchen@google.com>
Date: Tue, 4 Jan 2022 14:56:40 -0800
Subject: [PATCH] Fix tuner API review comments.

Bug: 213174685
Fix: 213174685
Test: atest android.media.tv.tuner.ct
Change-Id: I5136affc90333f184e5bc1875216502fcb9cbe2a
---
 core/api/system-current.txt                                 | 4 ++--
 media/java/android/media/tv/tuner/Tuner.java                | 6 +++---
 .../java/android/media/tv/tuner/frontend/ScanCallback.java  | 2 +-
 media/jni/android_media_tv_Tuner.cpp                        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 3a48d7cc674cd..3e870665be6c1 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -6469,7 +6469,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[]);
@@ -7919,7 +7919,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();
   }
 
 }
diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java
index 300aa15a3afda..4128abf03e071 100644
--- a/media/java/android/media/tv/tuner/Tuner.java
+++ b/media/java/android/media/tv/tuner/Tuner.java
@@ -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();
                         }
                     }
                 });
diff --git a/media/java/android/media/tv/tuner/frontend/ScanCallback.java b/media/java/android/media/tv/tuner/frontend/ScanCallback.java
index 6bbc13fe66f4b..68f3c1bce01b6 100644
--- a/media/java/android/media/tv/tuner/frontend/ScanCallback.java
+++ b/media/java/android/media/tv/tuner/frontend/ScanCallback.java
@@ -37,7 +37,7 @@ public interface ScanCallback {
     void onLocked();
 
     /** Scan unlocked the signal. */
-    default void onUnLocked() {}
+    default void onUnlocked() {}
 
     /** Scan stopped. */
     void onScanStopped();
diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp
index 8ccc4fb3cd021..c601649b74a12 100644
--- a/media/jni/android_media_tv_Tuner.cpp
+++ b/media/jni/android_media_tv_Tuner.cpp
@@ -1044,7 +1044,7 @@ void FrontendClientCallbackImpl::executeOnScanMessage(
             } else {
                 env->CallVoidMethod(
                         frontend,
-                        env->GetMethodID(clazz, "onUnLocked", "()V"));
+                        env->GetMethodID(clazz, "onUnlocked", "()V"));
             }
             break;
         }