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

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

Merge cherrypicks of [2347437, 2347414, 2347546, 2347415, 2347511, 2347416,... 

Merge cherrypicks of [2347437, 2347414, 2347546, 2347415, 2347511, 2347416, 2347439, 2347513, 2347378, 2347473, 2347399, 2347400, 2347474, 2347475, 2347515, 2347516, 2347641, 2347564] into oc-dr1-release

Change-Id: Ia85e928781292b2267a6f3ace9c29c1acf9b041b
parents d62eb6f2 65500f0e

cmds/installd/InstalldNativeService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2259,13 +2259,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
@@ -111,7 +111,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
@@ -76,7 +76,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,