tag f71f23e54a82988a1aac6af6654da66e722b8b77
tagger The Android Open Source Project <initial-contribution@android.com> Tue May 18 12:10:33 2021 -0700
object b0298f5cf614c260334cf8fdcd0e73fcaccf7664

Android S Beta 1

commit b0298f5cf614c260334cf8fdcd0e73fcaccf7664
author Mohammad Samiul Islam <samiul@google.com> Tue May 11 19:31:27 2021 +0100
committer Mohammad Samiul Islam <samiul@google.com> Mon May 17 16:11:50 2021 +0100
tree bd08e32ed891bef8f01905c2a900e5e32cff41c6
parent 7eb151db10a0421c338165d73e95a952a1aa2273

Refactor CAPEX decompression flow

Currently, we take decompressed APEX in consideration when adding data
apex to ApexFileRepository and when selecting APEX for activation. Such
considerations make the logic more complicated than required.

In this CL, we get rid of considerations for decompressed APEX in both
addition of data apex and selecting APEX for activation. We only
consider pre-installed APEX present in system and updated data apex
present in /data/apex/active. This results in CAPEX being selected for
activation, regardless of whether it has been decompressed already or
not.

These selected CAPEX then gets sent to ProcessCompressedApex method,
which is now smart enough to determine when decompression can be
avoided.

Bug: 185708645
Test: atest ApexTestCases ApexCompressionTests
Test: Manually tested that updating system APEX that has different root
digest without a version bump gets decompressed (via adb and OTA).

Change-Id: Id76c1caab84e9b5ae09196267eb096c4aa7cddb2