Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7870229 authored by Michael Groover's avatar Michael Groover Committed by Automerger Merge Worker
Browse files

Merge "Repackage APK to resolve testCheckSignaturesRotatedAgainstOriginal"... 

Merge "Repackage APK to resolve testCheckSignaturesRotatedAgainstOriginal" into udc-dev am: 0f07b01f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23603591



Change-Id: I7d8b8c406d552c4ba145cfde9ee1bf94be5cb01e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b1702bd 0f07b01f

services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageManagerTests.java

+0 −2
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ import android.system.StructStat; 
import android.test.AndroidTestCase;

import android.util.Log;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.LargeTest;

import androidx.test.filters.SmallTest;

import androidx.test.filters.Suppress;
@@ -2507,7 +2506,6 @@ public class PackageManagerTests extends AndroidTestCase { 
    }



    @LargeTest

    @FlakyTest(bugId = 283797480)

    public void testCheckSignaturesRotatedAgainstRotated() throws Exception {

        // checkSignatures should be successful when both apps have been signed with the same

        // rotated key since the initial signature comparison between the two apps should