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

Commit 46788a9b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [2344945, 2344576, 2344897, 2344874, 2344907, 2344949,... 

Merge cherrypicks of [2344945, 2344576, 2344897, 2344874, 2344907, 2344949, 2345021, 2344909, 2344951, 2344837, 2344962, 2344838, 2345121, 2345141, 2345122, 2345062, 2344915] into oc-release

Change-Id: I8dbdfabd8be2e19749cc09a9cddc46b81a1d7325
parents 88a8024e 06bb57e2

cmds/installd/InstalldNativeService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2249,13 +2249,13 @@ binder::Status InstalldNativeService::moveAb(const std::string& apkPath, 
}



binder::Status InstalldNativeService::deleteOdex(const std::string& apkPath,

        const std::string& instructionSet, const std::string& outputPath) {

        const std::string& instructionSet, const std::unique_ptr<std::string>& outputPath) {

    ENFORCE_UID(AID_SYSTEM);

    std::lock_guard<std::recursive_mutex> lock(mLock);



    const char* apk_path = apkPath.c_str();

    const char* instruction_set = instructionSet.c_str();

    const char* oat_dir = outputPath.c_str();

    const char* oat_dir = outputPath ? outputPath->c_str() : nullptr;



    bool res = delete_odex(apk_path, instruction_set, oat_dir);

    return res ? ok() : error();

cmds/installd/InstalldNativeService.h

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public: 
    binder::Status moveAb(const std::string& apkPath, const std::string& instructionSet,

            const std::string& outputPath);

    binder::Status deleteOdex(const std::string& apkPath, const std::string& instructionSet,

            const std::string& outputPath);

            const std::unique_ptr<std::string>& outputPath);

    binder::Status reconcileSecondaryDexFile(const std::string& dexPath,

        const std::string& packageName, int32_t uid, const std::vector<std::string>& isa,

        const std::unique_ptr<std::string>& volumeUuid, int32_t storage_flag, bool* _aidl_return);

cmds/installd/binder/android/os/IInstalld.aidl

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ interface IInstalld { 
    void moveAb(@utf8InCpp String apkPath, @utf8InCpp String instructionSet,

            @utf8InCpp String outputPath);

    void deleteOdex(@utf8InCpp String apkPath, @utf8InCpp String instructionSet,

            @utf8InCpp String outputPath);

            @nullable @utf8InCpp String outputPath);



    boolean reconcileSecondaryDexFile(@utf8InCpp String dexPath, @utf8InCpp String pkgName,

        int uid, in @utf8InCpp String[] isas, @nullable @utf8InCpp String volume_uuid,

cmds/installd/dexopt.cpp

+4 −1
Original line number Diff line number Diff line
@@ -1880,8 +1880,11 @@ bool delete_odex(const char* apk_path, const char* instruction_set, const char* 
    // Derive and delete the app image.

    bool return_value_art = unlink_and_check(create_image_filename(out_path).c_str());



    // Derive and delete the vdex file.

    bool return_value_vdex = unlink_and_check(create_vdex_filename(out_path).c_str());



    // Report success.

    return return_value_oat && return_value_art;

    return return_value_oat && return_value_art && return_value_vdex;

}



}  // namespace installd