Merge "Fix AccountManagerServiceTest" into tm-dev
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user