diff options
| author | Jooyung Han <jooyung@google.com> | 2020-03-07 21:47:09 +0900 |
|---|---|---|
| committer | Jooyung Han <jooyung@google.com> | 2020-03-12 06:22:10 +0000 |
| commit | 4b1d2889dc3efc01669d8e15c3270e2a0981c44d (patch) | |
| tree | 5fc5deecc6bbb75cf6dd47200395efec25f58884 /cmds/idmap2 | |
| parent | 124787817a687c98ede9bb7a6f2eb12a7661fe76 (diff) | |
Use aidl::nullable for nullable type in C++
To reduce the discrepance between old code which still uses
std::unique_ptr and new code using std::optional.
This might help to avoid merge-conflicts between branches.
Bug: 144773267
Test: m
Merged-In I33822bc76ef87637d5408849f64a0607e121792e
Change-Id: I33822bc76ef87637d5408849f64a0607e121792e
(cherry picked from commit ad62e8cbf5cf6083568f6f230ef7d73ad8776971)
Exempt-From-Owner-Approval: cherry-pick from master
Diffstat (limited to 'cmds/idmap2')
| -rw-r--r-- | cmds/idmap2/idmap2d/Idmap2Service.cpp | 4 | ||||
| -rw-r--r-- | cmds/idmap2/idmap2d/Idmap2Service.h | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cmds/idmap2/idmap2d/Idmap2Service.cpp b/cmds/idmap2/idmap2d/Idmap2Service.cpp index 63c22ef6fb3e..02e92aeb9dc6 100644 --- a/cmds/idmap2/idmap2d/Idmap2Service.cpp +++ b/cmds/idmap2/idmap2d/Idmap2Service.cpp @@ -113,7 +113,7 @@ 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::optional<std::string>* _aidl_return) { + aidl::nullable<std::string>* _aidl_return) { assert(_aidl_return); SYSTRACE << "Idmap2Service::createIdmap " << target_apk_path << " " << overlay_apk_path; _aidl_return->reset(); @@ -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 = idmap_path; + *_aidl_return = aidl::make_nullable<std::string>(idmap_path); return ok(); } diff --git a/cmds/idmap2/idmap2d/Idmap2Service.h b/cmds/idmap2/idmap2d/Idmap2Service.h index 047353f52590..b6f5136fc801 100644 --- a/cmds/idmap2/idmap2d/Idmap2Service.h +++ b/cmds/idmap2/idmap2d/Idmap2Service.h @@ -19,9 +19,7 @@ #include <android-base/unique_fd.h> #include <binder/BinderService.h> - -#include <optional> -#include <string> +#include <binder/Nullable.h> #include "android/os/BnIdmap2.h" @@ -46,7 +44,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::optional<std::string>* _aidl_return) override; + aidl::nullable<std::string>* _aidl_return) override; }; } // namespace android::os |