diff options
| author | SzuWei Lin <szuweilin@google.com> | 2019-12-23 20:15:12 +0800 |
|---|---|---|
| committer | SzuWei Lin <szuweilin@google.com> | 2019-12-23 20:15:12 +0800 |
| commit | 852adb28b85569bdf07ef4273a8800a5ca5f38d6 (patch) | |
| tree | ec259bf6da278c1ece0a446f40fd9cb595d5d2eb | |
| parent | 42f74c6d7844894af351896e3e9669c8124c94f7 (diff) | |
| parent | 5f47732ae26cd83d46fe3defd0b41544e5402f08 (diff) | |
| download | platform_system_apex-852adb28b85569bdf07ef4273a8800a5ca5f38d6.tar.gz platform_system_apex-852adb28b85569bdf07ef4273a8800a5ca5f38d6.tar.bz2 platform_system_apex-852adb28b85569bdf07ef4273a8800a5ca5f38d6.zip | |
Merge branch android10-qpr1-release
Change-Id: I11b9542d45f97c3d856b241f2695039b8c0bf0c2
| -rw-r--r-- | apexd/apexservice.cpp | 5 | ||||
| -rw-r--r-- | tests/TEST_MAPPING | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/apexd/apexservice.cpp b/apexd/apexservice.cpp index 13d21139..c49df0c5 100644 --- a/apexd/apexservice.cpp +++ b/apexd/apexservice.cpp @@ -281,10 +281,7 @@ static bool contains(const std::vector<ApexFile>& list, const ApexFile& apexFile) { return std::find_if(list.begin(), list.end(), [&apexFile](const ApexFile& listFile) { - return apexFile.GetManifest().name().compare( - listFile.GetManifest().name()) == 0 && - apexFile.GetManifest().version() == - listFile.GetManifest().version(); + return apexFile.GetPath() == listFile.GetPath(); }) != list.end(); } diff --git a/tests/TEST_MAPPING b/tests/TEST_MAPPING index 8e7a3836..7e89fcd3 100644 --- a/tests/TEST_MAPPING +++ b/tests/TEST_MAPPING @@ -4,9 +4,6 @@ "name": "apex_targetprep_tests" }, { - "name": "timezone_data_e2e_tests" - }, - { "name": "CtsStagedInstallHostTestCases" } ] |