From c726a6f02599e4da2c73d2fbcb7acab9b4831bae Mon Sep 17 00:00:00 2001 From: Hongguang Date: Wed, 17 Nov 2021 18:04:12 -0800 Subject: [PATCH] Update SharedFilter token acquire/free API name Bug: 205738784 Test: atest android.media.tv.tuner.cts Change-Id: Id42c9a0943d14bbca6938f8ff764b3e1d37f4244 --- core/api/system-current.txt | 4 ++-- .../android/media/tv/tuner/filter/Filter.java | 18 +++++++++--------- media/jni/android_media_tv_Tuner.cpp | 18 +++++++++--------- media/jni/tuner/FilterClient.cpp | 8 ++++---- media/jni/tuner/FilterClient.h | 8 ++++---- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 9ade639dc9a59..e60483b4bcf42 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -6362,14 +6362,14 @@ package android.media.tv.tuner.filter { } public class Filter implements java.lang.AutoCloseable { + method @Nullable public String acquireSharedFilterToken(); method public void close(); method public int configure(@NonNull android.media.tv.tuner.filter.FilterConfiguration); - method @Nullable public String createSharedFilter(); method public int flush(); + method public void freeSharedFilterToken(@NonNull String); method @Deprecated public int getId(); method public long getIdLong(); method public int read(@NonNull byte[], long, long); - method public void releaseSharedFilter(@NonNull String); method public int setDataSource(@Nullable android.media.tv.tuner.filter.Filter); method public int setMonitorEventMask(int); method public int start(); diff --git a/media/java/android/media/tv/tuner/filter/Filter.java b/media/java/android/media/tv/tuner/filter/Filter.java index ae2711200afd4..f0f576e90d917 100644 --- a/media/java/android/media/tv/tuner/filter/Filter.java +++ b/media/java/android/media/tv/tuner/filter/Filter.java @@ -251,8 +251,8 @@ public class Filter implements AutoCloseable { private native int nativeFlushFilter(); private native int nativeRead(byte[] buffer, long offset, long size); private native int nativeClose(); - private native String nativeCreateSharedFilter(); - private native void nativeReleaseSharedFilter(String token); + private native String nativeAcquireSharedFilterToken(); + private native void nativeFreeSharedFilterToken(String token); // Called by JNI private Filter(long id) { @@ -562,20 +562,20 @@ public class Filter implements AutoCloseable { } /** - * Creates a shared filter. + * Acquires a shared filter token. * * @return a string shared filter token. */ @Nullable - public String createSharedFilter() { + public String acquireSharedFilterToken() { synchronized (mLock) { TunerUtils.checkResourceState(TAG, mIsClosed); if (mIsStarted || mIsShared) { - Log.d(TAG, "Create shared filter in a wrong state, started: " + + Log.d(TAG, "Acquire shared filter in a wrong state, started: " + mIsStarted + "shared: " + mIsShared); return null; } - String token = nativeCreateSharedFilter(); + String token = nativeAcquireSharedFilterToken(); if (token != null) { mIsShared = true; } @@ -584,17 +584,17 @@ public class Filter implements AutoCloseable { } /** - * Releases a shared filter. + * Frees a shared filter token. * * @param filterToken the token of the shared filter being released. */ - public void releaseSharedFilter(@NonNull String filterToken) { + public void freeSharedFilterToken(@NonNull String filterToken) { synchronized (mLock) { TunerUtils.checkResourceState(TAG, mIsClosed); if (!mIsShared) { return; } - nativeReleaseSharedFilter(filterToken); + nativeFreeSharedFilterToken(filterToken); mIsShared = false; } } diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp index c4dfee42c3cd8..9526c52e32509 100644 --- a/media/jni/android_media_tv_Tuner.cpp +++ b/media/jni/android_media_tv_Tuner.cpp @@ -3890,22 +3890,22 @@ static jint android_media_tv_Tuner_close_filter(JNIEnv *env, jobject filter) { return (jint)r; } -static jstring android_media_tv_Tuner_create_shared_filter(JNIEnv *env, jobject filter) { +static jstring android_media_tv_Tuner_acquire_shared_filter_token(JNIEnv *env, jobject filter) { sp filterClient = getFilterClient(env, filter); if (filterClient == nullptr) { jniThrowException(env, "java/lang/IllegalStateException", - "Failed to create shared filter: filter client not found"); + "Failed to acquire shared filter token: filter client not found"); return nullptr; } - string token = filterClient->createSharedFilter(); + string token = filterClient->acquireSharedFilterToken(); if (token.empty()) { return nullptr; } return env->NewStringUTF(token.data()); } -static void android_media_tv_Tuner_release_shared_filter( +static void android_media_tv_Tuner_free_shared_filter_token( JNIEnv *env, jobject filter, jstring token) { sp filterClient = getFilterClient(env, filter); if (filterClient == nullptr) { @@ -3915,7 +3915,7 @@ static void android_media_tv_Tuner_release_shared_filter( } std::string filterToken(env->GetStringUTFChars(token, nullptr)); - filterClient->releaseSharedFilter(filterToken); + filterClient->freeSharedFilterToken(filterToken); } static sp getTimeFilterClient(JNIEnv *env, jobject filter) { @@ -4408,10 +4408,10 @@ static const JNINativeMethod gFilterMethods[] = { { "nativeFlushFilter", "()I", (void *)android_media_tv_Tuner_flush_filter }, { "nativeRead", "([BJJ)I", (void *)android_media_tv_Tuner_read_filter_fmq }, { "nativeClose", "()I", (void *)android_media_tv_Tuner_close_filter }, - {"nativeCreateSharedFilter", "()Ljava/lang/String;", - (void *)android_media_tv_Tuner_create_shared_filter}, - {"nativeReleaseSharedFilter", "(Ljava/lang/String;)V", - (void *)android_media_tv_Tuner_release_shared_filter}, + {"nativeAcquireSharedFilterToken", "()Ljava/lang/String;", + (void *)android_media_tv_Tuner_acquire_shared_filter_token}, + {"nativeFreeSharedFilterToken", "(Ljava/lang/String;)V", + (void *)android_media_tv_Tuner_free_shared_filter_token}, }; static const JNINativeMethod gSharedFilterMethods[] = { diff --git a/media/jni/tuner/FilterClient.cpp b/media/jni/tuner/FilterClient.cpp index e8b3de82f2841..bd283dce60a50 100644 --- a/media/jni/tuner/FilterClient.cpp +++ b/media/jni/tuner/FilterClient.cpp @@ -196,10 +196,10 @@ Result FilterClient::close() { return Result::INVALID_STATE; } -string FilterClient::createSharedFilter() { +string FilterClient::acquireSharedFilterToken() { if (mTunerFilter != nullptr) { string filterToken; - if (mTunerFilter->createSharedFilter(&filterToken).isOk()) { + if (mTunerFilter->acquireSharedFilterToken(&filterToken).isOk()) { return filterToken; } } @@ -207,9 +207,9 @@ string FilterClient::createSharedFilter() { return ""; } -Result FilterClient::releaseSharedFilter(const string& filterToken) { +Result FilterClient::freeSharedFilterToken(const string& filterToken) { if (mTunerFilter != nullptr) { - Status s = mTunerFilter->releaseSharedFilter(filterToken); + Status s = mTunerFilter->freeSharedFilterToken(filterToken); return ClientHelper::getServiceSpecificErrorCode(s); } diff --git a/media/jni/tuner/FilterClient.h b/media/jni/tuner/FilterClient.h index c031b2ac0b5ba..7ebe7bc76c6f1 100644 --- a/media/jni/tuner/FilterClient.h +++ b/media/jni/tuner/FilterClient.h @@ -143,14 +143,14 @@ public: Result close(); /** - * Create a new SharedFiler. + * Accquire a new SharedFiler token. */ - string createSharedFilter(); + string acquireSharedFilterToken(); /** - * Release SharedFiler. + * Release SharedFiler token. */ - Result releaseSharedFilter(const string& filterToken); + Result freeSharedFilterToken(const string& filterToken); private: Result getFilterMq();