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

Commit e759337a authored by Lee Shombert's avatar Lee Shombert Committed by Automerger Merge Worker
Browse files

Merge "Fix AccountManagerServiceTest" into tm-dev am: 6c0cabea 

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



Change-Id: I8f7acdbd9044813ad776b79ad73ab2a897cbedb6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 64bcac19 6c0cabea

services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.accounts.AccountManagerInternal; 
import android.accounts.CantAddAccountActivity;

import android.accounts.IAccountManagerResponse;

import android.app.AppOpsManager;

import android.app.PropertyInvalidatedCache;

import android.app.INotificationManager;

import android.app.admin.DevicePolicyManager;

import android.app.admin.DevicePolicyManagerInternal;
@@ -132,6 +133,8 @@ public class AccountManagerServiceTest extends AndroidTestCase { 
    protected void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);



        PropertyInvalidatedCache.disableForTestMode();



        when(mMockPackageManager.checkSignatures(anyInt(), anyInt()))

                    .thenReturn(PackageManager.SIGNATURE_MATCH);

        final UserInfo ui = new UserInfo(UserHandle.USER_SYSTEM, "user0", 0);