commit 9c3abd4631d6f8c86c69aa0dde5d6c1f0b97fb94
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 28 01:49:55 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 28 01:49:55 2018 +0000
tree 39055862c8ce0d08c42f98aaf3e191ecc94540ab
parent 361f2e0366dec3560664dc20c9834f31c505814a
parent 1ebe77f1520fbbd7f633eef42c867fe79b672c1d

Merge "Use absolute paths in tests."

cmds/installd/InstalldNativeService.cpp

diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index ffdd327..68acc69 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -103,6 +103,7 @@
 }
 
 static binder::Status exception(uint32_t code, const std::string& msg) {
+    LOG(ERROR) << msg << " (" << code << ")";
     return binder::Status::fromExceptionCode(code, String8(msg.c_str()));
 }
 

cmds/installd/tests/installd_dexopt_test.cpp

diff --git a/cmds/installd/tests/installd_dexopt_test.cpp b/cmds/installd/tests/installd_dexopt_test.cpp
index db55be7..d640558 100644
--- a/cmds/installd/tests/installd_dexopt_test.cpp
+++ b/cmds/installd/tests/installd_dexopt_test.cpp
@@ -375,7 +375,7 @@
 
         bool prof_result;
         binder::Status prof_binder_result = service_->prepareAppProfile(
-                package_name_, kTestUserId, kTestAppId, *profile_name_ptr, /*code path*/ "base.apk",
+                package_name_, kTestUserId, kTestAppId, *profile_name_ptr, apk_path_,
                 /*dex_metadata*/ nullptr, &prof_result);
 
         ASSERT_TRUE(prof_binder_result.isOk()) << prof_binder_result.toString8().c_str();
@@ -731,7 +731,7 @@
             bool expected_result) {
         bool result;
         binder::Status binder_result = service_->prepareAppProfile(
-                package_name, kTestUserId, kTestAppId, profile_name, /*code path*/ "base.apk",
+                package_name, kTestUserId, kTestAppId, profile_name, apk_path_,
                 /*dex_metadata*/ nullptr, &result);
         ASSERT_TRUE(binder_result.isOk()) << binder_result.toString8().c_str();
         ASSERT_EQ(expected_result, result);