Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2aef4661 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Don't use String8 path functions [cas hidl]" into main am: 750f415a... 

Merge "Don't use String8 path functions [cas hidl]" into main am: 750f415a am: 1efd2541 am: 20ad8cc4

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2731253



Change-Id: I529acc18776b091f52cbdf70c1197f640378312b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14b0e4dd 20ad8cc4

cas/1.0/default/FactoryLoader.h

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef 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 <dlfcn.h>

#include "SharedLibrary.h"
@@ -108,7 +109,7 @@ bool FactoryLoader<T>::findFactoryForScheme( 
    struct dirent* pEntry;

    while ((pEntry = readdir(pDir))) {

        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)) {

                mCASystemIdToLibraryPathMap.add(CA_system_id, pluginPath);
@@ -150,7 +151,7 @@ bool FactoryLoader<T>::enumeratePlugins( 
    struct dirent* pEntry;

    while ((pEntry = readdir(pDir))) {

        String8 pluginPath = dirPath + "/" + pEntry->d_name;

        if (pluginPath.getPathExtension() == ".so") {

        if (base::EndsWith(pluginPath.c_str(), ".so")) {

            queryPluginsFromPath(pluginPath, results);

        }

    }

cas/1.1/default/FactoryLoader.h

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef 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 <dlfcn.h>

#include <media/cas/CasAPI.h>
@@ -100,7 +101,7 @@ bool FactoryLoader<T>::findFactoryForScheme(int32_t CA_system_id, sp<SharedLibra 
    struct dirent* pEntry;

    while ((pEntry = readdir(pDir))) {

        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)) {

                mCASystemIdToLibraryPathMap.add(CA_system_id, pluginPath);

                closedir(pDir);
@@ -139,7 +140,7 @@ bool FactoryLoader<T>::enumeratePlugins(vector<HidlCasPluginDescriptor>* results 
    struct dirent* pEntry;

    while ((pEntry = readdir(pDir))) {

        String8 pluginPath = dirPath + "/" + pEntry->d_name;

        if (pluginPath.getPathExtension() == ".so") {

        if (base::EndsWith(pluginPath.c_str(), ".so")) {

            queryPluginsFromPath(pluginPath, results);

        }

    }

cas/1.2/default/FactoryLoader.h

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef 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 <dlfcn.h>

#include <media/cas/CasAPI.h>
@@ -100,7 +101,7 @@ bool FactoryLoader<T>::findFactoryForScheme(int32_t CA_system_id, sp<SharedLibra 
    struct dirent* pEntry;

    while ((pEntry = readdir(pDir))) {

        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)) {

                mCASystemIdToLibraryPathMap.add(CA_system_id, pluginPath);

                closedir(pDir);
@@ -139,7 +140,7 @@ bool FactoryLoader<T>::enumeratePlugins(vector<HidlCasPluginDescriptor>* results 
    struct dirent* pEntry;

    while ((pEntry = readdir(pDir))) {

        String8 pluginPath = dirPath + "/" + pEntry->d_name;

        if (pluginPath.getPathExtension() == ".so") {

        if (base::EndsWith(pluginPath.c_str(), ".so")) {

            queryPluginsFromPath(pluginPath, results);

        }

    }