diff options
| author | Mårten Kongstad <marten.kongstad@sony.com> | 2018-11-29 08:23:14 +0100 |
|---|---|---|
| committer | Todd Kennedy <toddke@google.com> | 2018-12-21 08:16:09 -0800 |
| commit | 0eba72a4dd3489a11af5ca93d0a2c334d486138b (patch) | |
| tree | 65ce9130728ea1f6f8be0267226d4b43ad9ec210 /cmds/idmap2/idmap2d/Idmap2Service.cpp | |
| parent | 2527fa3abdba19698f08cfbb5344d05e535d2e4f (diff) | |
idmap2: fix clang-tidy warnings [modernize-*]
Bug: 120024673
Test: mmm frameworks/base/cmds/idmap2; check output
Change-Id: I8768169fb7b541eb6b1aa3311c46a710eb71aac9
Diffstat (limited to 'cmds/idmap2/idmap2d/Idmap2Service.cpp')
| -rw-r--r-- | cmds/idmap2/idmap2d/Idmap2Service.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cmds/idmap2/idmap2d/Idmap2Service.cpp b/cmds/idmap2/idmap2d/Idmap2Service.cpp index 7b16093434fb..d2e46e15fc59 100644 --- a/cmds/idmap2/idmap2d/Idmap2Service.cpp +++ b/cmds/idmap2/idmap2d/Idmap2Service.cpp @@ -56,8 +56,7 @@ Status error(const std::string& msg) { } // namespace -namespace android { -namespace os { +namespace android::os { Status Idmap2Service::getIdmapPath(const std::string& overlay_apk_path, int32_t user_id ATTRIBUTE_UNUSED, std::string* _aidl_return) { @@ -132,9 +131,8 @@ Status Idmap2Service::createIdmap(const std::string& target_apk_path, return error("failed to write to idmap path " + idmap_path); } - _aidl_return->reset(new std::string(idmap_path)); + *_aidl_return = std::make_unique<std::string>(idmap_path); return ok(); } -} // namespace os -} // namespace android +} // namespace android::os |