Merge "AudioTrack: Add error event logging"
diff --git a/services/tuner/TunerFilter.cpp b/services/tuner/TunerFilter.cpp
index 2efbd91..db8e462 100644
--- a/services/tuner/TunerFilter.cpp
+++ b/services/tuner/TunerFilter.cpp
@@ -346,7 +346,7 @@
return res;
}
-::ndk::ScopedAStatus TunerFilter::createSharedFilter(string* _aidl_return) {
+::ndk::ScopedAStatus TunerFilter::acquireSharedFilterToken(string* _aidl_return) {
Mutex::Autolock _l(mLock);
if (mFilter == nullptr) {
ALOGE("IFilter is not initialized");
@@ -369,7 +369,7 @@
return ::ndk::ScopedAStatus::ok();
}
-::ndk::ScopedAStatus TunerFilter::releaseSharedFilter(const string& /* in_filterToken */) {
+::ndk::ScopedAStatus TunerFilter::freeSharedFilterToken(const string& /* in_filterToken */) {
Mutex::Autolock _l(mLock);
if (mFilter == nullptr) {
ALOGE("IFilter is not initialized");
diff --git a/services/tuner/TunerFilter.h b/services/tuner/TunerFilter.h
index c6b41d3..46686d6 100644
--- a/services/tuner/TunerFilter.h
+++ b/services/tuner/TunerFilter.h
@@ -91,8 +91,8 @@
::ndk::ScopedAStatus stop() override;
::ndk::ScopedAStatus flush() override;
::ndk::ScopedAStatus close() override;
- ::ndk::ScopedAStatus createSharedFilter(string* _aidl_return) override;
- ::ndk::ScopedAStatus releaseSharedFilter(const string& in_filterToken) override;
+ ::ndk::ScopedAStatus acquireSharedFilterToken(string* _aidl_return) override;
+ ::ndk::ScopedAStatus freeSharedFilterToken(const string& in_filterToken) override;
::ndk::ScopedAStatus getFilterType(DemuxFilterType* _aidl_return) override;
bool isSharedFilterAllowed(int32_t pid);
diff --git a/services/tuner/aidl/android/media/tv/tuner/ITunerFilter.aidl b/services/tuner/aidl/android/media/tv/tuner/ITunerFilter.aidl
index 0450a57..f009655 100644
--- a/services/tuner/aidl/android/media/tv/tuner/ITunerFilter.aidl
+++ b/services/tuner/aidl/android/media/tv/tuner/ITunerFilter.aidl
@@ -101,19 +101,19 @@
void close();
/**
- * Create a new SharedFilter instance.
+ * Acquire a new SharedFilter token.
*
* @return a token of the newly created SharedFilter instance.
*/
- String createSharedFilter();
+ String acquireSharedFilterToken();
/**
- * Release a SharedFilter instance.
+ * Free a SharedFilter token.
*
- * @param filterToken the SharedFilter will be released.
+ * @param filterToken the SharedFilter token will be released.
* @return a token of the newly created SharedFilter instance.
*/
- void releaseSharedFilter(in String filterToken);
+ void freeSharedFilterToken(in String filterToken);
/**
* Get filter type.
diff --git a/services/tuner/hidl/TunerHidlFilter.cpp b/services/tuner/hidl/TunerHidlFilter.cpp
index 93d9431..9222060 100644
--- a/services/tuner/hidl/TunerHidlFilter.cpp
+++ b/services/tuner/hidl/TunerHidlFilter.cpp
@@ -521,7 +521,7 @@
return ::ndk::ScopedAStatus::ok();
}
-::ndk::ScopedAStatus TunerHidlFilter::createSharedFilter(string* _aidl_return) {
+::ndk::ScopedAStatus TunerHidlFilter::acquireSharedFilterToken(string* _aidl_return) {
Mutex::Autolock _l(mLock);
if (mFilter == nullptr) {
ALOGE("IFilter is not initialized");
@@ -545,7 +545,7 @@
return ::ndk::ScopedAStatus::ok();
}
-::ndk::ScopedAStatus TunerHidlFilter::releaseSharedFilter(const string& /* in_filterToken */) {
+::ndk::ScopedAStatus TunerHidlFilter::freeSharedFilterToken(const string& /* in_filterToken */) {
Mutex::Autolock _l(mLock);
if (mFilter == nullptr) {
ALOGE("IFilter is not initialized");
diff --git a/services/tuner/hidl/TunerHidlFilter.h b/services/tuner/hidl/TunerHidlFilter.h
index 548b753..62bab26 100644
--- a/services/tuner/hidl/TunerHidlFilter.h
+++ b/services/tuner/hidl/TunerHidlFilter.h
@@ -182,8 +182,8 @@
::ndk::ScopedAStatus stop() override;
::ndk::ScopedAStatus flush() override;
::ndk::ScopedAStatus close() override;
- ::ndk::ScopedAStatus createSharedFilter(string* _aidl_return) override;
- ::ndk::ScopedAStatus releaseSharedFilter(const string& in_filterToken) override;
+ ::ndk::ScopedAStatus acquireSharedFilterToken(string* _aidl_return) override;
+ ::ndk::ScopedAStatus freeSharedFilterToken(const string& in_filterToken) override;
::ndk::ScopedAStatus getFilterType(DemuxFilterType* _aidl_return) override;
bool isSharedFilterAllowed(int32_t pid);