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

Commit 44e23c87 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Use absolute paths in tests." am: 9c3abd46 

am: 513c5af5

Change-Id: Ied5bef6a4f2665ce0569a0e2fdd1797644cc6624
parents 5f96cb61 513c5af5

cmds/installd/InstalldNativeService.cpp

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ static binder::Status ok() { 
}



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

+2 −2
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ protected: 


        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 @@ class ProfileTest : public DexoptTest { 
            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);