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

Commit ca342596 authored by Calin Juravle's avatar Calin Juravle Committed by Android (Google) Code Review
Browse files

Merge "[installd] Remove boot complete marker" into qt-qpr1-dev

parents 032fe38e 331ea664

cmds/installd/InstalldNativeService.cpp

+0 −20
Original line number Diff line number Diff line
@@ -2136,26 +2136,6 @@ 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::unique_ptr<std::string>& uuid, const std::string& packageName,

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

cmds/installd/InstalldNativeService.h

+0 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ 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::unique_ptr<std::string>& uuid, int64_t targetFreeBytes,

            int64_t cacheReservedBytes, int32_t flags);

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

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

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