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

Commit fcdd8bb6 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "test: Make mMockitoRule public for... 

Merge "test: Make mMockitoRule public for AppWithAdminGrantedPermissionsCounterTest" into main am: 4dca839a

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3448908



Change-Id: I765810619bbf6685ec5f08b0fd4a6d6b14c12e1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 962cd2e8 4dca839a

tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ import java.util.Collections; 
public final class AppWithAdminGrantedPermissionsCounterTest {



    @Rule

    MockitoRule mMockitoRule = MockitoJUnit.rule();

    public MockitoRule mMockitoRule = MockitoJUnit.rule();



    private final String APP_1 = "app1";

    private final String APP_2 = "app2";