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

Commit d6d28550 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
Browse files

Fix AccountManagerServiceTest am: d9543578 am: 658b8e7e

am: eac40d99

Change-Id: I27b4175f949e5416943a2a3782b772ce65b846e6
parents a33f506c eac40d99
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import android.accounts.Account;
import android.accounts.AccountManagerInternal;
import android.accounts.AuthenticatorDescription;
import android.app.AppOpsManager;
import android.app.Notification;
@@ -45,6 +46,8 @@ import android.test.mock.MockPackageManager;
import android.test.suitebuilder.annotation.SmallTest;
import android.util.Log;

import com.android.server.LocalServices;

import java.io.File;
import java.io.FileDescriptor;
import java.io.PrintWriter;
@@ -74,6 +77,7 @@ public class AccountManagerServiceTest extends AndroidTestCase {
        SQLiteDatabase.deleteDatabase(new File(mAms.getCeDatabaseName(UserHandle.USER_SYSTEM)));
        SQLiteDatabase.deleteDatabase(new File(mAms.getDeDatabaseName(UserHandle.USER_SYSTEM)));
        SQLiteDatabase.deleteDatabase(new File(mAms.getPreNDatabaseName(UserHandle.USER_SYSTEM)));
        LocalServices.removeServiceForTest(AccountManagerInternal.class);
        super.tearDown();
    }

@@ -289,6 +293,7 @@ public class AccountManagerServiceTest extends AndroidTestCase {

    private AccountManagerService createAccountManagerService(Context mockContext,
            Context realContext) {
        LocalServices.removeServiceForTest(AccountManagerInternal.class);
        return new MyAccountManagerService(mockContext,
                new MyMockPackageManager(), new MockAccountAuthenticatorCache(), realContext);
    }
@@ -427,6 +432,11 @@ public class AccountManagerServiceTest extends AndroidTestCase {
        public int checkSignatures(final int uid1, final int uid2) {
            return PackageManager.SIGNATURE_MATCH;
        }

        @Override
        public void addOnPermissionsChangeListener(
                OnPermissionsChangedListener listener) {
        }
    }

    static class MyAccountManagerService extends AccountManagerService {