summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2019-03-25 14:53:03 -0700
committer android-build-merger <android-build-merger@google.com> 2019-03-25 14:53:03 -0700
commit1361663ba9e64303e9885e1a32c648247dbc60c2 (patch)
treee0b4612873a085a1630e21c27502e2ee4511443e
parent6ac1a5f838c9be49d8318f7b1a4556afed583836 (diff)
parentd90862d9e3ce6ec59e7a5c06a4103b494daa2bbd (diff)
Merge "Installd: Fix installd_dexopt_test" am: c75833b1d0 am: 203201be03
am: d90862d9e3 Change-Id: I174447d01749d4f88b6aa2c1d1d950d6ecac5693
-rw-r--r--cmds/installd/tests/installd_dexopt_test.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/cmds/installd/tests/installd_dexopt_test.cpp b/cmds/installd/tests/installd_dexopt_test.cpp
index 36d5a600b2..fa2b0d9660 100644
--- a/cmds/installd/tests/installd_dexopt_test.cpp
+++ b/cmds/installd/tests/installd_dexopt_test.cpp
@@ -936,8 +936,7 @@ class ProfileTest : public DexoptTest {
protected:
void TransitionToSystemServer() {
ASSERT_TRUE(DropCapabilities(kSystemUid, kSystemGid));
- int32_t res = selinux_android_setcontext(
- kSystemUid, true, se_info_.c_str(), "system_server");
+ int32_t res = selinux_android_setcon("u:r:system_server:s0");
ASSERT_EQ(0, res) << "Failed to setcon " << strerror(errno);
}