Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b72d34d4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Minor cleanups." am: 95f9945c am: bb9fccad am: 1bb6270f am: ace9304c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1896828

Change-Id: Ib8813180543283bc7568cf0f2b74353cfc8887d4
parents 5badd837 ace9304c

PREUPLOAD.cfg

+1 −0
Original line number Diff line number Diff line
@@ -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/

cmds/installd/dexopt.cpp

+4 −4
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ 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,

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.