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

Merge "Use optional for nullable types" into rvc-dev-plus-aosp am: 238660eff6 am: a51e0a687a

Browse Source 
Change-Id: I0fc599fb5a201a4062ce59d63d54ec6ffe6ec8e7
This commit is contained in:
Automerger Merge Worker
2020-02-26 16:44:56 +00:00
parent 8fb3e7992e a51e0a687a
commit ad03b4cb78
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmds/idmap2/idmap2d/Idmap2Service.cpp
View File

@@ -113,10 +113,10 @@ Status Idmap2Service::verifyIdmap(const std::string& overlay_apk_path,
Status Idmap2Service::createIdmap(const std::string& target_apk_path,
const std::string& overlay_apk_path, int32_t fulfilled_policies,
bool enforce_overlayable, int32_t user_id ATTRIBUTE_UNUSED,
std::unique_ptr<std::string>* _aidl_return) {
std::optional<std::string>* _aidl_return) {
assert(_aidl_return);
SYSTRACE << "Idmap2Service::createIdmap " << target_apk_path << " " << overlay_apk_path;
_aidl_return->reset(nullptr);
_aidl_return->reset();
const PolicyBitmask policy_bitmask = ConvertAidlArgToPolicyBitmask(fulfilled_policies);
@@ -155,7 +155,7 @@ Status Idmap2Service::createIdmap(const std::string& target_apk_path,
return error("failed to write to idmap path " + idmap_path);
}
*_aidl_return = std::make_unique<std::string>(idmap_path);
*_aidl_return = idmap_path;
return ok();
}

4
cmds/idmap2/idmap2d/Idmap2Service.h
View File

@@ -20,7 +20,7 @@
#include <android-base/unique_fd.h>
#include <binder/BinderService.h>
#include <memory>
#include <optional>
#include <string>
#include "android/os/BnIdmap2.h"
@@ -46,7 +46,7 @@ class Idmap2Service : public BinderService<Idmap2Service>, public BnIdmap2 {
binder::Status createIdmap(const std::string& target_apk_path,
const std::string& overlay_apk_path, int32_t fulfilled_policies,
bool enforce_overlayable, int32_t user_id,
std::unique_ptr<std::string>* _aidl_return) override;
std::optional<std::string>* _aidl_return) override;
};
} // namespace android::os

2
services/incremental/IncrementalService.cpp
View File

@@ -1078,7 +1078,7 @@ bool IncrementalService::prepareDataLoader(IncrementalService::IncFsMount& ifs,
return false;
}
FileSystemControlParcel fsControlParcel;
fsControlParcel.incremental = std::make_unique<IncrementalFileSystemControlParcel>();
fsControlParcel.incremental = IncrementalFileSystemControlParcel();
fsControlParcel.incremental->cmd.reset(base::unique_fd(::dup(ifs.control.cmd)));
fsControlParcel.incremental->pendingReads.reset(
base::unique_fd(::dup(ifs.control.pendingReads)));