From fbbf811c5afe2adf7d478f660ad328173b2ccea5 Mon Sep 17 00:00:00 2001 From: Michael Groover Date: Tue, 27 Jun 2023 15:30:12 -0500 Subject: [PATCH] Repackage app2 to resolve testCheckSignaturesRotatedAgainstOriginal All of the APKs that are used by the PackageManagerTests do not have a valid uses-sdk element, so they are treated as having a targetSdkVersion of 0. The install_app1_cert5 was previously repackaged to resolve a similar test failure, and recently the install_app2_cert5_rotated_cert6 started to fail the install due to Play Protect. It's unknown why this APK was not previously reported with the fix for install_app1_cert5, but this commit repackages the install_app2_cert5_rotated_cert6 APK with a minSdkVersion of 23 and a targetSdkVersion of 34 to resolve these test failures. Fixes: 283797480 Test: atest PackageManagerTests Merged-In: I6917d89d515a77e6bdeb0d09a7b6656460809c2b (cherry picked from commit 30d10b865be40629d32d7c508c60235a07a80802) Change-Id: I6917d89d515a77e6bdeb0d09a7b6656460809c2b --- .../res/raw/install_app2_cert5_rotated_cert6 | Bin 16856 -> 16852 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/services/tests/PackageManagerServiceTests/server/res/raw/install_app2_cert5_rotated_cert6 b/services/tests/PackageManagerServiceTests/server/res/raw/install_app2_cert5_rotated_cert6 index 30bb6478d18de88a7802d4516beb815514d14b7e..6feebb8c833c95f7a127a297edee2aab38313e5d 100644 GIT binary patch delta 3566 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 L8XQRZ=kmV*FaK*1 delta 3282 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