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

Commit 384977fc authored by Fred Quintana's avatar Fred Quintana Committed by Android (Google) Code Review
Browse files

Merge "add caching to the AccountManagerService"

parents 81b2d075 56285a60

core/java/android/accounts/AccountAuthenticatorCache.java

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ import java.io.IOException; 
 * @hide

 */

/* package private */ class AccountAuthenticatorCache

        extends RegisteredServicesCache<AuthenticatorDescription> {

        extends RegisteredServicesCache<AuthenticatorDescription> 

        implements IAccountAuthenticatorCache {

    private static final String TAG = "Account";

    private static final MySerializer sSerializer = new MySerializer();

core/java/android/accounts/AccountManagerService.java

+425 −181

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/accounts/IAccountAuthenticatorCache.java

0 → 100644
+63 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.accounts;



import android.content.pm.RegisteredServicesCache;

import android.content.pm.RegisteredServicesCacheListener;

import android.os.Handler;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.Collection;



/**

 * An interface to the Authenticator specialization of RegisteredServicesCache. The use of

 * this interface by the AccountManagerService makes it easier to unit test it.

 * @hide

 */

public interface IAccountAuthenticatorCache {

    /**

     * Accessor for the {@link android.content.pm.RegisteredServicesCache.ServiceInfo} that

     * matched the specified {@link android.accounts.AuthenticatorDescription} or null

     * if none match.

     * @param type the authenticator type to return

     * @return the {@link android.content.pm.RegisteredServicesCache.ServiceInfo} that

     * matches the account type or null if none is present

     */

    RegisteredServicesCache.ServiceInfo<AuthenticatorDescription> getServiceInfo(

            AuthenticatorDescription type);



    /**

     * @return A copy of a Collection of all the current Authenticators.

     */

    Collection<RegisteredServicesCache.ServiceInfo<AuthenticatorDescription>> getAllServices();



    /**

     * Dumps the state of the cache. See

     * {@link android.os.Binder#dump(java.io.FileDescriptor, java.io.PrintWriter, String[])}

     */

    void dump(FileDescriptor fd, PrintWriter fout, String[] args);



    /**

     * Sets a listener that will be notified whenever the authenticator set changes

     * @param listener the listener to notify, or null

     * @param handler the {@link Handler} on which the notification will be posted. If null

     * the notification will be posted on the main thread.

     */

    void setListener(RegisteredServicesCacheListener<AuthenticatorDescription> listener,

            Handler handler);

}
 
 No newline at end of file

core/java/android/content/pm/RegisteredServicesCache.java

+2 −1
Original line number Diff line number Diff line
@@ -182,7 +182,8 @@ public abstract class RegisteredServicesCache<V> { 
        public final ComponentName componentName;

        public final int uid;



        private ServiceInfo(V type, ComponentName componentName, int uid) {

        /** @hide */

        public ServiceInfo(V type, ComponentName componentName, int uid) {

            this.type = type;

            this.componentName = componentName;

            this.uid = uid;

core/tests/coretests/src/android/accounts/AccountManagerServiceTest.java

+146 −75
Original line number Diff line number Diff line
@@ -16,30 +16,42 @@ 


package android.accounts;



import android.app.Notification;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.pm.RegisteredServicesCache.ServiceInfo;

import android.content.pm.RegisteredServicesCacheListener;

import android.os.Bundle;

import android.os.Handler;

import android.test.AndroidTestCase;

import android.test.RenamingDelegatingContext;

import android.test.IsolatedContext;

import android.test.mock.MockContext;

import android.test.RenamingDelegatingContext;

import android.test.mock.MockContentResolver;

import android.content.*;

import android.accounts.Account;

import android.accounts.AccountManagerService;

import android.os.Bundle;

import android.test.mock.MockContext;

import android.test.mock.MockPackageManager;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collection;

import java.util.Comparator;



public class AccountManagerServiceTest extends AndroidTestCase {

    private AccountManagerService mAms;



    @Override

    protected void setUp() throws Exception {

        final String filenamePrefix = "test.";

        MockContentResolver resolver = new MockContentResolver();

        RenamingDelegatingContext targetContextWrapper = new RenamingDelegatingContext(

                new MockContext(), // The context that most methods are delegated to

                new MyMockContext(), // The context that most methods are delegated to

                getContext(), // The context that file methods are delegated to

                filenamePrefix);

        Context context = new IsolatedContext(resolver, targetContextWrapper);

        setContext(context);

        mAms = new MyAccountManagerService(getContext(),

                new MyMockPackageManager(), new MockAccountAuthenticatorCache());

    }



    public class AccountSorter implements Comparator<Account> {
@@ -54,21 +66,20 @@ public class AccountManagerServiceTest extends AndroidTestCase { 
    }



    public void testCheckAddAccount() throws Exception {

        AccountManagerService ams = new AccountManagerService(getContext());

        Account a11 = new Account("account1", "type1");

        Account a21 = new Account("account2", "type1");

        Account a31 = new Account("account3", "type1");

        Account a12 = new Account("account1", "type2");

        Account a22 = new Account("account2", "type2");

        Account a32 = new Account("account3", "type2");

        ams.addAccount(a11, "p11", null);

        ams.addAccount(a12, "p12", null);

        ams.addAccount(a21, "p21", null);

        ams.addAccount(a22, "p22", null);

        ams.addAccount(a31, "p31", null);

        ams.addAccount(a32, "p32", null);



        Account[] accounts = ams.getAccounts(null);

        mAms.addAccount(a11, "p11", null);

        mAms.addAccount(a12, "p12", null);

        mAms.addAccount(a21, "p21", null);

        mAms.addAccount(a22, "p22", null);

        mAms.addAccount(a31, "p31", null);

        mAms.addAccount(a32, "p32", null);



        Account[] accounts = mAms.getAccounts(null);

        Arrays.sort(accounts, new AccountSorter());

        assertEquals(6, accounts.length);

        assertEquals(a11, accounts[0]);
@@ -78,16 +89,16 @@ public class AccountManagerServiceTest extends AndroidTestCase { 
        assertEquals(a22, accounts[4]);

        assertEquals(a32, accounts[5]);



        accounts = ams.getAccountsByType("type1" );

        accounts = mAms.getAccounts("type1" );

        Arrays.sort(accounts, new AccountSorter());

        assertEquals(3, accounts.length);

        assertEquals(a11, accounts[0]);

        assertEquals(a21, accounts[1]);

        assertEquals(a31, accounts[2]);



        ams.removeAccount(null, a21);

        mAms.removeAccount(a21);



        accounts = ams.getAccountsByType("type1" );

        accounts = mAms.getAccounts("type1" );

        Arrays.sort(accounts, new AccountSorter());

        assertEquals(2, accounts.length);

        assertEquals(a11, accounts[0]);
@@ -95,23 +106,21 @@ public class AccountManagerServiceTest extends AndroidTestCase { 
    }



    public void testPasswords() throws Exception {

        AccountManagerService ams = new AccountManagerService(getContext());

        Account a11 = new Account("account1", "type1");

        Account a12 = new Account("account1", "type2");

        ams.addAccount(a11, "p11", null);

        ams.addAccount(a12, "p12", null);

        mAms.addAccount(a11, "p11", null);

        mAms.addAccount(a12, "p12", null);



        assertEquals("p11", ams.getPassword(a11));

        assertEquals("p12", ams.getPassword(a12));

        assertEquals("p11", mAms.getPassword(a11));

        assertEquals("p12", mAms.getPassword(a12));



        ams.setPassword(a11, "p11b");

        mAms.setPassword(a11, "p11b");



        assertEquals("p11b", ams.getPassword(a11));

        assertEquals("p12", ams.getPassword(a12));

        assertEquals("p11b", mAms.getPassword(a11));

        assertEquals("p12", mAms.getPassword(a12));

    }



    public void testUserdata() throws Exception {

        AccountManagerService ams = new AccountManagerService(getContext());

        Account a11 = new Account("account1", "type1");

        Bundle u11 = new Bundle();

        u11.putString("a", "a_a11");
@@ -122,57 +131,119 @@ public class AccountManagerServiceTest extends AndroidTestCase { 
        u12.putString("a", "a_a12");

        u12.putString("b", "b_a12");

        u12.putString("c", "c_a12");

        ams.addAccount(a11, "p11", u11);

        ams.addAccount(a12, "p12", u12);



        assertEquals("a_a11", ams.getUserData(a11, "a"));

        assertEquals("b_a11", ams.getUserData(a11, "b"));

        assertEquals("c_a11", ams.getUserData(a11, "c"));

        assertEquals("a_a12", ams.getUserData(a12, "a"));

        assertEquals("b_a12", ams.getUserData(a12, "b"));

        assertEquals("c_a12", ams.getUserData(a12, "c"));



        ams.setUserData(a11, "b", "b_a11b");



        assertEquals("a_a11", ams.getUserData(a11, "a"));

        assertEquals("b_a11b", ams.getUserData(a11, "b"));

        assertEquals("c_a11", ams.getUserData(a11, "c"));

        assertEquals("a_a12", ams.getUserData(a12, "a"));

        assertEquals("b_a12", ams.getUserData(a12, "b"));

        assertEquals("c_a12", ams.getUserData(a12, "c"));

        mAms.addAccount(a11, "p11", u11);

        mAms.addAccount(a12, "p12", u12);



        assertEquals("a_a11", mAms.getUserData(a11, "a"));

        assertEquals("b_a11", mAms.getUserData(a11, "b"));

        assertEquals("c_a11", mAms.getUserData(a11, "c"));

        assertEquals("a_a12", mAms.getUserData(a12, "a"));

        assertEquals("b_a12", mAms.getUserData(a12, "b"));

        assertEquals("c_a12", mAms.getUserData(a12, "c"));



        mAms.setUserData(a11, "b", "b_a11b");

        mAms.setUserData(a12, "c", null);



        assertEquals("a_a11", mAms.getUserData(a11, "a"));

        assertEquals("b_a11b", mAms.getUserData(a11, "b"));

        assertEquals("c_a11", mAms.getUserData(a11, "c"));

        assertEquals("a_a12", mAms.getUserData(a12, "a"));

        assertEquals("b_a12", mAms.getUserData(a12, "b"));

        assertNull(mAms.getUserData(a12, "c"));

    }



    public void testAuthtokens() throws Exception {

        AccountManagerService ams = new AccountManagerService(getContext());

        Account a11 = new Account("account1", "type1");

        Account a12 = new Account("account1", "type2");

        ams.addAccount(a11, "p11", null);

        ams.addAccount(a12, "p12", null);



        ams.setAuthToken(a11, "att1", "a11_att1");

        ams.setAuthToken(a11, "att2", "a11_att2");

        ams.setAuthToken(a11, "att3", "a11_att3");

        ams.setAuthToken(a12, "att1", "a12_att1");

        ams.setAuthToken(a12, "att2", "a12_att2");

        ams.setAuthToken(a12, "att3", "a12_att3");



        assertEquals("a11_att1", ams.peekAuthToken(a11, "att1"));

        assertEquals("a11_att2", ams.peekAuthToken(a11, "att2"));

        assertEquals("a11_att3", ams.peekAuthToken(a11, "att3"));

        assertEquals("a12_att1", ams.peekAuthToken(a12, "att1"));

        assertEquals("a12_att2", ams.peekAuthToken(a12, "att2"));

        assertEquals("a12_att3", ams.peekAuthToken(a12, "att3"));



        ams.setAuthToken(a11, "att3", "a11_att3b");

        ams.invalidateAuthToken(a12.type, "a12_att2");



        assertEquals("a11_att1", ams.peekAuthToken(a11, "att1"));

        assertEquals("a11_att2", ams.peekAuthToken(a11, "att2"));

        assertEquals("a11_att3b", ams.peekAuthToken(a11, "att3"));

        assertEquals("a12_att1", ams.peekAuthToken(a12, "att1"));

        assertNull(ams.peekAuthToken(a12, "att2"));

        assertEquals("a12_att3", ams.peekAuthToken(a12, "att3"));



        assertNull(ams.readAuthTokenFromDatabase(a12, "att2"));

        mAms.addAccount(a11, "p11", null);

        mAms.addAccount(a12, "p12", null);



        mAms.setAuthToken(a11, "att1", "a11_att1");

        mAms.setAuthToken(a11, "att2", "a11_att2");

        mAms.setAuthToken(a11, "att3", "a11_att3");

        mAms.setAuthToken(a12, "att1", "a12_att1");

        mAms.setAuthToken(a12, "att2", "a12_att2");

        mAms.setAuthToken(a12, "att3", "a12_att3");



        assertEquals("a11_att1", mAms.peekAuthToken(a11, "att1"));

        assertEquals("a11_att2", mAms.peekAuthToken(a11, "att2"));

        assertEquals("a11_att3", mAms.peekAuthToken(a11, "att3"));

        assertEquals("a12_att1", mAms.peekAuthToken(a12, "att1"));

        assertEquals("a12_att2", mAms.peekAuthToken(a12, "att2"));

        assertEquals("a12_att3", mAms.peekAuthToken(a12, "att3"));



        mAms.setAuthToken(a11, "att3", "a11_att3b");

        mAms.invalidateAuthToken(a12.type, "a12_att2");



        assertEquals("a11_att1", mAms.peekAuthToken(a11, "att1"));

        assertEquals("a11_att2", mAms.peekAuthToken(a11, "att2"));

        assertEquals("a11_att3b", mAms.peekAuthToken(a11, "att3"));

        assertEquals("a12_att1", mAms.peekAuthToken(a12, "att1"));

        assertNull(mAms.peekAuthToken(a12, "att2"));

        assertEquals("a12_att3", mAms.peekAuthToken(a12, "att3"));



        assertNull(mAms.peekAuthToken(a12, "att2"));

    }



    static public class MockAccountAuthenticatorCache implements IAccountAuthenticatorCache {

        private ArrayList<ServiceInfo<AuthenticatorDescription>> mServices;



        public MockAccountAuthenticatorCache() {

            mServices = new ArrayList<ServiceInfo<AuthenticatorDescription>>();

            AuthenticatorDescription d1 = new AuthenticatorDescription("type1", "p1", 0, 0, 0, 0);

            AuthenticatorDescription d2 = new AuthenticatorDescription("type2", "p2", 0, 0, 0, 0);

            mServices.add(new ServiceInfo<AuthenticatorDescription>(d1, null, 0));

            mServices.add(new ServiceInfo<AuthenticatorDescription>(d2, null, 0));

        }



        public ServiceInfo<AuthenticatorDescription> getServiceInfo(AuthenticatorDescription type) {

            for (ServiceInfo<AuthenticatorDescription> service : mServices) {

                if (service.type.equals(type)) {

                    return service;

                }

            }

            return null;

        }



        public Collection<ServiceInfo<AuthenticatorDescription>> getAllServices() {

            return mServices;

        }



        public void dump(final FileDescriptor fd, final PrintWriter fout, final String[] args) {

        }



        public void setListener(

                final RegisteredServicesCacheListener<AuthenticatorDescription> listener,

                final Handler handler) {

        }

    }



    static public class MyMockContext extends MockContext {

        @Override

        public int checkCallingOrSelfPermission(final String permission) {

            return PackageManager.PERMISSION_GRANTED;

        }

    }



    static public class MyMockPackageManager extends MockPackageManager {

        @Override

        public int checkSignatures(final int uid1, final int uid2) {

            return PackageManager.SIGNATURE_MATCH;

        }

    }



    static public class MyAccountManagerService extends AccountManagerService {

        public MyAccountManagerService(Context context, PackageManager packageManager,

                IAccountAuthenticatorCache authenticatorCache) {

            super(context, packageManager, authenticatorCache);

        }



        @Override

        protected void installNotification(final int notificationId, final Notification n) {

        }



        @Override

        protected void cancelNotification(final int id) {

        }

    }

}