diff options
| author | Calin Juravle <calin@google.com> | 2020-03-18 23:13:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-18 23:13:02 +0000 |
| commit | ca3425964ae63a69dc1e8bf8d9a0995fd8cc120e (patch) | |
| tree | 57bf7939a6519aa777d18b3a85a30b40702453d1 | |
| parent | 032fe38ea9c601062111aed783512edc1eb710ab (diff) | |
| parent | 331ea664c89d24657a533aeb16952a47762bbc42 (diff) | |
| download | android_frameworks_native-ca3425964ae63a69dc1e8bf8d9a0995fd8cc120e.tar.gz android_frameworks_native-ca3425964ae63a69dc1e8bf8d9a0995fd8cc120e.tar.bz2 android_frameworks_native-ca3425964ae63a69dc1e8bf8d9a0995fd8cc120e.zip | |
Merge "[installd] Remove boot complete marker" into qt-qpr1-dev
| -rw-r--r-- | cmds/installd/InstalldNativeService.cpp | 20 | ||||
| -rw-r--r-- | cmds/installd/InstalldNativeService.h | 1 | ||||
| -rw-r--r-- | cmds/installd/binder/android/os/IInstalld.aidl | 1 |
3 files changed, 0 insertions, 22 deletions
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp index caac2e89a..34727270e 100644 --- a/cmds/installd/InstalldNativeService.cpp +++ b/cmds/installd/InstalldNativeService.cpp @@ -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) { diff --git a/cmds/installd/InstalldNativeService.h b/cmds/installd/InstalldNativeService.h index 2b7bf33cb..eba966d4a 100644 --- a/cmds/installd/InstalldNativeService.h +++ b/cmds/installd/InstalldNativeService.h @@ -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, diff --git a/cmds/installd/binder/android/os/IInstalld.aidl b/cmds/installd/binder/android/os/IInstalld.aidl index 26e9984f1..b795c0264 100644 --- a/cmds/installd/binder/android/os/IInstalld.aidl +++ b/cmds/installd/binder/android/os/IInstalld.aidl @@ -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, |