tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Don't use String8 path functions [cas hidl]" into main

Browse source
This commit is contained in:
Tomasz Wasilczyk 2023-08-30 04:29:48 +00:00 committed by Gerrit Code Review
commit 750f415a8d
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cas/1.0/default/FactoryLoader.h
View file

@ -17,6 +17,7 @@
#ifndef ANDROID_HARDWARE_CAS_V1_0_FACTORY_LOADER_H_ #ifndef ANDROID_HARDWARE_CAS_V1_0_FACTORY_LOADER_H_
#define ANDROID_HARDWARE_CAS_V1_0_FACTORY_LOADER_H_ #define ANDROID_HARDWARE_CAS_V1_0_FACTORY_LOADER_H_
#include <android-base/strings.h>
#include <dirent.h> #include <dirent.h>
#include <dlfcn.h> #include <dlfcn.h>
#include "SharedLibrary.h" #include "SharedLibrary.h"
@ -108,7 +109,7 @@ bool FactoryLoader<T>::findFactoryForScheme(
struct dirent* pEntry; struct dirent* pEntry;
while ((pEntry = readdir(pDir))) { while ((pEntry = readdir(pDir))) {
String8 pluginPath = dirPath + "/" + pEntry->d_name; String8 pluginPath = dirPath + "/" + pEntry->d_name;
if (pluginPath.getPathExtension() == ".so") { if (base::EndsWith(pluginPath.c_str(), ".so")) {
if (loadFactoryForSchemeFromPath( if (loadFactoryForSchemeFromPath(
pluginPath, CA_system_id, library, factory)) { pluginPath, CA_system_id, library, factory)) {
mCASystemIdToLibraryPathMap.add(CA_system_id, pluginPath); mCASystemIdToLibraryPathMap.add(CA_system_id, pluginPath);
@ -150,7 +151,7 @@ bool FactoryLoader<T>::enumeratePlugins(
struct dirent* pEntry; struct dirent* pEntry;
while ((pEntry = readdir(pDir))) { while ((pEntry = readdir(pDir))) {
String8 pluginPath = dirPath + "/" + pEntry->d_name; String8 pluginPath = dirPath + "/" + pEntry->d_name;
if (pluginPath.getPathExtension() == ".so") { if (base::EndsWith(pluginPath.c_str(), ".so")) {
queryPluginsFromPath(pluginPath, results); queryPluginsFromPath(pluginPath, results);
} }
} }

5
cas/1.1/default/FactoryLoader.h
View file

@ -17,6 +17,7 @@
#ifndef ANDROID_HARDWARE_CAS_V1_1_FACTORY_LOADER_H_ #ifndef ANDROID_HARDWARE_CAS_V1_1_FACTORY_LOADER_H_
#define ANDROID_HARDWARE_CAS_V1_1_FACTORY_LOADER_H_ #define ANDROID_HARDWARE_CAS_V1_1_FACTORY_LOADER_H_
#include <android-base/strings.h>
#include <dirent.h> #include <dirent.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <media/cas/CasAPI.h> #include <media/cas/CasAPI.h>
@ -100,7 +101,7 @@ bool FactoryLoader<T>::findFactoryForScheme(int32_t CA_system_id, sp<SharedLibra
struct dirent* pEntry; struct dirent* pEntry;
while ((pEntry = readdir(pDir))) { while ((pEntry = readdir(pDir))) {
String8 pluginPath = dirPath + "/" + pEntry->d_name; String8 pluginPath = dirPath + "/" + pEntry->d_name;
if (pluginPath.getPathExtension() == ".so") { if (base::EndsWith(pluginPath.c_str(), ".so")) {
if (loadFactoryForSchemeFromPath(pluginPath, CA_system_id, library, factory)) { if (loadFactoryForSchemeFromPath(pluginPath, CA_system_id, library, factory)) {
mCASystemIdToLibraryPathMap.add(CA_system_id, pluginPath); mCASystemIdToLibraryPathMap.add(CA_system_id, pluginPath);
closedir(pDir); closedir(pDir);
@ -139,7 +140,7 @@ bool FactoryLoader<T>::enumeratePlugins(vector<HidlCasPluginDescriptor>* results
struct dirent* pEntry; struct dirent* pEntry;
while ((pEntry = readdir(pDir))) { while ((pEntry = readdir(pDir))) {
String8 pluginPath = dirPath + "/" + pEntry->d_name; String8 pluginPath = dirPath + "/" + pEntry->d_name;
if (pluginPath.getPathExtension() == ".so") { if (base::EndsWith(pluginPath.c_str(), ".so")) {
queryPluginsFromPath(pluginPath, results); queryPluginsFromPath(pluginPath, results);
} }
} }

5
cas/1.2/default/FactoryLoader.h
View file

@ -17,6 +17,7 @@
#ifndef ANDROID_HARDWARE_CAS_V1_1_FACTORY_LOADER_H_ #ifndef ANDROID_HARDWARE_CAS_V1_1_FACTORY_LOADER_H_
#define ANDROID_HARDWARE_CAS_V1_1_FACTORY_LOADER_H_ #define ANDROID_HARDWARE_CAS_V1_1_FACTORY_LOADER_H_
#include <android-base/strings.h>
#include <dirent.h> #include <dirent.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <media/cas/CasAPI.h> #include <media/cas/CasAPI.h>
@ -100,7 +101,7 @@ bool FactoryLoader<T>::findFactoryForScheme(int32_t CA_system_id, sp<SharedLibra
struct dirent* pEntry; struct dirent* pEntry;
while ((pEntry = readdir(pDir))) { while ((pEntry = readdir(pDir))) {
String8 pluginPath = dirPath + "/" + pEntry->d_name; String8 pluginPath = dirPath + "/" + pEntry->d_name;
if (pluginPath.getPathExtension() == ".so") { if (base::EndsWith(pluginPath.c_str(), ".so")) {
if (loadFactoryForSchemeFromPath(pluginPath, CA_system_id, library, factory)) { if (loadFactoryForSchemeFromPath(pluginPath, CA_system_id, library, factory)) {
mCASystemIdToLibraryPathMap.add(CA_system_id, pluginPath); mCASystemIdToLibraryPathMap.add(CA_system_id, pluginPath);
closedir(pDir); closedir(pDir);
@ -139,7 +140,7 @@ bool FactoryLoader<T>::enumeratePlugins(vector<HidlCasPluginDescriptor>* results
struct dirent* pEntry; struct dirent* pEntry;
while ((pEntry = readdir(pDir))) { while ((pEntry = readdir(pDir))) {
String8 pluginPath = dirPath + "/" + pEntry->d_name; String8 pluginPath = dirPath + "/" + pEntry->d_name;
if (pluginPath.getPathExtension() == ".so") { if (base::EndsWith(pluginPath.c_str(), ".so")) {
queryPluginsFromPath(pluginPath, results); queryPluginsFromPath(pluginPath, results);
} }
} }