summaryrefslogtreecommitdiffstats
path: root/init/service_test.cpp
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2018-05-18 15:25:15 -0700
committerMark Salyzyn <salyzyn@google.com>2018-05-29 15:18:38 -0700
commit1385725e0995052ad96b482a60e9ffd5b663ddb5 (patch)
tree02b9690f42bb6a8782f54686843b44a6a8af0aee /init/service_test.cpp
parent06aeb41c16cb26e0f53cb964e657fe528437bb4d (diff)
downloadsystem_core-1385725e0995052ad96b482a60e9ffd5b663ddb5.tar.gz
system_core-1385725e0995052ad96b482a60e9ffd5b663ddb5.tar.bz2
system_core-1385725e0995052ad96b482a60e9ffd5b663ddb5.zip
init: switch out keychord id with std::vector match of chords
Drop all references to keychord_id and id and instead use keycodes_ as the id. The keycodes are a std::vector<int> with an unique sorted-order emplacement method added in the parser. Solves the academic issue with duplicate keychords and trigger all services that match rather than first match only. Test: init_tests Bug: 64114943 Change-Id: I5582779d81458fda393004c551c0d3c03d9471e0
Diffstat (limited to 'init/service_test.cpp')
-rw-r--r--init/service_test.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/init/service_test.cpp b/init/service_test.cpp
index b43c2e9b4..194aa2be0 100644
--- a/init/service_test.cpp
+++ b/init/service_test.cpp
@@ -46,7 +46,6 @@ TEST(service, pod_initialized) {
EXPECT_EQ(0U, service_in_old_memory->uid());
EXPECT_EQ(0U, service_in_old_memory->gid());
EXPECT_EQ(0U, service_in_old_memory->namespace_flags());
- EXPECT_EQ(0, service_in_old_memory->keychord_id());
EXPECT_EQ(IoSchedClass_NONE, service_in_old_memory->ioprio_class());
EXPECT_EQ(0, service_in_old_memory->ioprio_pri());
EXPECT_EQ(0, service_in_old_memory->priority());
@@ -66,7 +65,6 @@ TEST(service, pod_initialized) {
EXPECT_EQ(0U, service_in_old_memory2->uid());
EXPECT_EQ(0U, service_in_old_memory2->gid());
EXPECT_EQ(0U, service_in_old_memory2->namespace_flags());
- EXPECT_EQ(0, service_in_old_memory2->keychord_id());
EXPECT_EQ(IoSchedClass_NONE, service_in_old_memory2->ioprio_class());
EXPECT_EQ(0, service_in_old_memory2->ioprio_pri());
EXPECT_EQ(0, service_in_old_memory2->priority());