diff options
| author | 2021-11-20 02:32:25 +0000 | |
|---|---|---|
| committer | 2021-11-20 02:32:25 +0000 | |
| commit | ace9304caae11a45c6a4b1b451442bc10440ec4b (patch) | |
| tree | 9455b0dc683b83f9390087f40bf30d369be1c636 | |
| parent | 212ad69db726592268ba830eec0ea97dd79debad (diff) | |
| parent | 1bb6270faa02f82e78545eee06481d0cac152818 (diff) | |
Merge "Minor cleanups." am: 95f9945cb2 am: bb9fccad96 am: 1bb6270faa
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1896828
Change-Id: Iea7a35177d8a7128ff4c73e600ed4a7279faada5
| -rw-r--r-- | PREUPLOAD.cfg | 1 | ||||
| -rw-r--r-- | cmds/installd/dexopt.cpp | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index eb9a51d7b1..7ef26bf8d6 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg @@ -6,6 +6,7 @@ clang_format = true # Only turn on clang-format check for the following subfolders. clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp cmds/idlcli/ + cmds/installd/ cmds/servicemanager/ include/input/ include/powermanager/ diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp index f3ec63f870..d8fcc57c20 100644 --- a/cmds/installd/dexopt.cpp +++ b/cmds/installd/dexopt.cpp @@ -459,8 +459,8 @@ static UniqueFile open_reference_profile_as_unique_file(uid_t uid, const std::st }); } -static unique_fd open_spnashot_profile(uid_t uid, const std::string& package_name, - const std::string& location) { +static unique_fd open_snapshot_profile(uid_t uid, const std::string& package_name, + const std::string& location) { std::string profile = create_snapshot_profile_path(package_name, location); return open_profile(uid, profile, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR); } @@ -2562,7 +2562,7 @@ static bool create_app_profile_snapshot(int32_t app_id, const std::string& classpath) { int app_shared_gid = multiuser_get_shared_gid(/*user_id*/ 0, app_id); - unique_fd snapshot_fd = open_spnashot_profile(AID_SYSTEM, package_name, profile_name); + unique_fd snapshot_fd = open_snapshot_profile(AID_SYSTEM, package_name, profile_name); if (snapshot_fd < 0) { return false; } @@ -2636,7 +2636,7 @@ static bool create_boot_image_profile_snapshot(const std::string& package_name, } // Open and create the snapshot profile. - unique_fd snapshot_fd = open_spnashot_profile(AID_SYSTEM, package_name, profile_name); + unique_fd snapshot_fd = open_snapshot_profile(AID_SYSTEM, package_name, profile_name); // Collect all non empty profiles. // The collection will traverse all applications profiles and find the non empty files. |