Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Uninitialized member fix :(" into rvc-dev am: b9bc1dffbb am: ae88283aed

Browse Source 
Change-Id: I529c4c44239bc073044c2d49f0b6c474dfa20ab4
This commit is contained in:
TreeHugger Robot
2020-04-08 06:07:32 +00:00
committed by Automerger Merge Worker
parent 7c543a1a90 ae88283aed
commit beb71cfa07
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/incremental/IncrementalService.cpp
View File

@@ -581,6 +581,7 @@ StorageId IncrementalService::findStorageId(std::string_view path) const {
int IncrementalService::setStorageParams(StorageId storageId, bool enableReadLogs) { int IncrementalService::setStorageParams(StorageId storageId, bool enableReadLogs) {
const auto ifs = getIfs(storageId); const auto ifs = getIfs(storageId);
if (!ifs) { if (!ifs) {
LOG(ERROR) << "setStorageParams failed, invalid storageId: " << storageId;
return -EINVAL; return -EINVAL;
} }

4
services/incremental/IncrementalService.h
View File

@@ -160,12 +160,12 @@ public:
class IncrementalServiceConnector : public BnIncrementalServiceConnector { class IncrementalServiceConnector : public BnIncrementalServiceConnector {
public: public:
IncrementalServiceConnector(IncrementalService& incrementalService, int32_t storage) IncrementalServiceConnector(IncrementalService& incrementalService, int32_t storage)
: incrementalService(incrementalService) {} : incrementalService(incrementalService), storage(storage) {}
binder::Status setStorageParams(bool enableReadLogs, int32_t* _aidl_return) final; binder::Status setStorageParams(bool enableReadLogs, int32_t* _aidl_return) final;
private: private:
IncrementalService& incrementalService; IncrementalService& incrementalService;
int32_t storage; int32_t const storage;
}; };
private: private: