From 3b75828afe340f3114c48ea0754f05fa2d032e29 Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Tue, 8 Jun 2021 08:04:52 -0700 Subject: Extend profile analysis with proper return codes This allows us to fine tune the optimization strategy when profiles are empty. Test: atest installd_dexopt_test Bug: 188655918 Change-Id: Iaf782eedd92dfddd522feaecb446c85f3ae1c51e (cherry picked from commit e90de86f92669fc5557891fdfd1d6e6c2ef240fc) --- cmds/installd/InstalldNativeService.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmds/installd/InstalldNativeService.cpp') diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp index 0595322f92..f4159c0871 100644 --- a/cmds/installd/InstalldNativeService.cpp +++ b/cmds/installd/InstalldNativeService.cpp @@ -2357,7 +2357,7 @@ binder::Status InstalldNativeService::copySystemProfile(const std::string& syste // TODO: Consider returning error codes. binder::Status InstalldNativeService::mergeProfiles(int32_t uid, const std::string& packageName, - const std::string& profileName, bool* _aidl_return) { + const std::string& profileName, int* _aidl_return) { ENFORCE_UID(AID_SYSTEM); CHECK_ARGUMENT_PACKAGE_NAME(packageName); std::lock_guard lock(mLock); -- cgit v1.2.3-59-g8ed1b