gugelfrei
/
android_system_vold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

health.filesystem HAL renamed to health.storage

Browse Source 
Bug: 111655771
Test: compiles
Change-Id: Ibfcab4d116d735ba2f80a8b0ead314138a7ba23d
Merged-In: Ibfcab4d116d735ba2f80a8b0ead314138a7ba23d
gugelfrei
Yifan Hong 6 years ago
parent 3adf30745a
commit 91a68dfc98
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
Android.bp
Unescape View File

@ -140,7 +140,7 @@ cc_library_static {
}, },
}, },
shared_libs: [ shared_libs: [
"android.hardware.health.filesystem@1.0", "android.hardware.health.storage@1.0",
], ],
} }
@ -173,7 +173,7 @@ cc_binary {
], ],
shared_libs: [ shared_libs: [
"android.hardware.health.filesystem@1.0", "android.hardware.health.storage@1.0",
"libhidltransport", "libhidltransport",
], ],
} }

12
IdleMaint.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android-base/stringprintf.h> #include <android-base/stringprintf.h>
#include <android-base/strings.h> #include <android-base/strings.h>
#include <android/hardware/health/filesystem/1.0/IFileSystem.h> #include <android/hardware/health/storage/1.0/IStorage.h>
#include <fs_mgr.h> #include <fs_mgr.h>
#include <hardware_legacy/power.h> #include <hardware_legacy/power.h>
#include <private/android_filesystem_config.h> #include <private/android_filesystem_config.h>
@ -47,9 +47,9 @@ using android::base::Timer;
using android::base::WriteStringToFile; using android::base::WriteStringToFile;
using android::hardware::Return; using android::hardware::Return;
using android::hardware::Void; using android::hardware::Void;
using android::hardware::health::filesystem::V1_0::IFileSystem; using android::hardware::health::storage::V1_0::IGarbageCollectCallback;
using android::hardware::health::filesystem::V1_0::IGarbageCollectCallback; using android::hardware::health::storage::V1_0::IStorage;
using android::hardware::health::filesystem::V1_0::Result; using android::hardware::health::storage::V1_0::Result;
namespace android { namespace android {
namespace vold { namespace vold {
@ -346,7 +346,7 @@ class GcCallback : public IGarbageCollectCallback {
Result mResult{Result::UNKNOWN_ERROR}; Result mResult{Result::UNKNOWN_ERROR};
}; };
static void runDevGcOnHal(sp<IFileSystem> service) { static void runDevGcOnHal(sp<IStorage> service) {
LOG(DEBUG) << "Start Dev GC on HAL"; LOG(DEBUG) << "Start Dev GC on HAL";
sp<GcCallback> cb = new GcCallback(); sp<GcCallback> cb = new GcCallback();
auto ret = service->garbageCollect(DEVGC_TIMEOUT_SEC, cb); auto ret = service->garbageCollect(DEVGC_TIMEOUT_SEC, cb);
@ -358,7 +358,7 @@ static void runDevGcOnHal(sp<IFileSystem> service) {
} }
static void runDevGc(void) { static void runDevGc(void) {
auto service = IFileSystem::getService(); auto service = IStorage::getService();
if (service != nullptr) { if (service != nullptr) {
runDevGcOnHal(service); runDevGcOnHal(service);
} else { } else {

Write Preview
Loading…
Cancel
Save