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

Commit a6b3fd9c authored by Rick Yiu's avatar Rick Yiu
Browse files

Revert "resolve merge conflicts of ca342596..." 

Revert submission 10740208-resolve-merge

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_qt-qpr1-dev-plus-aosp&target=aosp_taimen-userdebug&lkgb=6310008&lkbb=6310735&fkbb=6310101, bug b/151887221

Reverted Changes:
I311042a72:resolve merge conflicts of e6dddc99898fe5da4d24e6c...
I2d0615a6e:resolve merge conflicts of ca342596...

Bug: 151887221
Change-Id: Ifdac4bb18b2d1f751cc7ad9660f687709d2749d7
parent d1105509

cmds/installd/InstalldNativeService.cpp

+20 −0
Original line number Diff line number Diff line
@@ -2263,6 +2263,26 @@ binder::Status InstalldNativeService::compileLayouts(const std::string& apkPath, 
    return *_aidl_return ? ok() : error("viewcompiler failed");

}



binder::Status InstalldNativeService::markBootComplete(const std::string& instructionSet) {

    ENFORCE_UID(AID_SYSTEM);

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



    const char* instruction_set = instructionSet.c_str();



    char boot_marker_path[PKG_PATH_MAX];

    sprintf(boot_marker_path,

          "%s/%s/%s/.booting",

          android_data_dir.c_str(),

          DALVIK_CACHE,

          instruction_set);



    ALOGV("mark_boot_complete : %s", boot_marker_path);

    if (unlink(boot_marker_path) != 0) {

        return error(StringPrintf("Failed to unlink %s", boot_marker_path));

    }

    return ok();

}



binder::Status InstalldNativeService::linkNativeLibraryDirectory(

        const std::optional<std::string>& uuid, const std::string& packageName,

        const std::string& nativeLibPath32, int32_t userId) {

cmds/installd/InstalldNativeService.h

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ public: 
            int32_t uid);

    binder::Status removeIdmap(const std::string& overlayApkPath);

    binder::Status rmPackageDir(const std::string& packageDir);

    binder::Status markBootComplete(const std::string& instructionSet);

    binder::Status freeCache(const std::optional<std::string>& uuid, int64_t targetFreeBytes,

            int64_t cacheReservedBytes, int32_t flags);

    binder::Status linkNativeLibraryDirectory(const std::optional<std::string>& uuid,

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

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ interface IInstalld { 
    void idmap(@utf8InCpp String targetApkPath, @utf8InCpp String overlayApkPath, int uid);

    void removeIdmap(@utf8InCpp String overlayApkPath);

    void rmPackageDir(@utf8InCpp String packageDir);

    void markBootComplete(@utf8InCpp String instructionSet);

    void freeCache(@nullable @utf8InCpp String uuid, long targetFreeBytes,

            long cacheReservedBytes, int flags);

    void linkNativeLibraryDirectory(@nullable @utf8InCpp String uuid,