Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix incompatible APK container signature"

Browse Source
This commit is contained in:
Chun-Wei Wang
2022-08-26 01:36:38 +00:00
committed by Android (Google) Code Review
parent 7566f477d9 8b082eaed2
commit ef9434cb9e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/StagedInstallTest/src/com/android/tests/stagedinstallinternal/host/StagedInstallInternalTest.java
View File

@@ -169,6 +169,12 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test {
assertTrue(getDevice().pushFile(apex, "/" + partition + "/apex/" + fileName));
}
private void installTestApex(String fileName, String... extraArgs) throws Exception {
CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(getBuild());
final File apex = buildHelper.getTestFile(fileName);
getDevice().installPackage(apex, false, extraArgs);
}
private void pushTestVendorApexAllowList(String installerPackageName) throws Exception {
if (!getDevice().isAdbRoot()) {
getDevice().enableAdbRoot();
@@ -551,7 +557,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test {
pushTestApex(REBOOTLESS_V1, "vendor");
getDevice().reboot();
runPhase("testVendorApex_VerifyFactory");
installPackage(REBOOTLESS_V2, "--staged");
installTestApex(REBOOTLESS_V2, "--staged");
getDevice().reboot();
runPhase("testVendorApex_VerifyData");
}
@@ -565,7 +571,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test {
pushTestApex(REBOOTLESS_V1, "vendor");
getDevice().reboot();
runPhase("testVendorApex_VerifyFactory");
installPackage(REBOOTLESS_V2, "--force-non-staged");
installTestApex(REBOOTLESS_V2, "--force-non-staged");
runPhase("testVendorApex_VerifyData");
}