diff options
| author | Jooyung Han <jooyung@google.com> | 2020-05-12 12:01:05 +0900 |
|---|---|---|
| committer | Jooyung Han <jooyung@google.com> | 2020-05-14 17:04:06 +0900 |
| commit | 499de895f25931b6b424ce5cc79bc25f911b9dc4 (patch) | |
| tree | 5303bb4c4affa3faf8077d2eae6c53ebf0b32bcb /apexd/apexd.cpp | |
| parent | e9684aca0d2c70e1fe9c757c693661f326bc99b5 (diff) | |
| download | platform_system_apex-499de895f25931b6b424ce5cc79bc25f911b9dc4.tar.gz platform_system_apex-499de895f25931b6b424ce5cc79bc25f911b9dc4.tar.bz2 platform_system_apex-499de895f25931b6b424ce5cc79bc25f911b9dc4.zip | |
Remove JSON support from APEXd
ApexFile::Open() doesn't fall back to apex_manifest.json for APEX
manifest.
Bug: 143973464
Test: atest CtsStagedInstallHostTestCases
Test: atest ApexTestCases
Change-Id: Ia0fad621806f2dc91caaa3123fdb55fb35f3ab5c
Diffstat (limited to 'apexd/apexd.cpp')
| -rw-r--r-- | apexd/apexd.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/apexd/apexd.cpp b/apexd/apexd.cpp index f52781af..1269a359 100644 --- a/apexd/apexd.cpp +++ b/apexd/apexd.cpp @@ -1176,8 +1176,7 @@ Result<void> ActivateApexPackages(const std::vector<ApexFile>& apexes) { } bool ShouldActivateApexOnData(const ApexFile& apex) { - return HasPreInstalledVersion(apex.GetManifest().name()) && - !apex.HasOnlyJsonManifest(); + return HasPreInstalledVersion(apex.GetManifest().name()); } } // namespace |