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

Commit 3ecd5f43 authored by Fred Quintana's avatar Fred Quintana
Browse files

- Make the AccountManagerService delete accounts that 

  have no Authenticator, both when the package is removed
  and when the phone is booted.
- add the ability to register with the RegisteredServicesCache
  to be notified when the set of Authenticators changes.
parent ddbeed5d

api/current.xml

+19 −0
Original line number Diff line number Diff line
@@ -42572,6 +42572,25 @@ 
>

</field>

</class>

<interface name="RegisteredServicesCacheListener"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="onRegisteredServicesCacheChanged"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

</interface>

<class name="ResolveInfo"

 extends="java.lang.Object"

 abstract="false"

core/java/android/accounts/AccountManagerService.java

+45 −8
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.RegisteredServicesCache;

import android.content.pm.PackageInfo;

import android.content.pm.ApplicationInfo;

import android.content.pm.RegisteredServicesCacheListener;

import android.database.Cursor;

import android.database.DatabaseUtils;

import android.database.sqlite.SQLiteDatabase;
@@ -69,7 +70,9 @@ import com.android.internal.R; 
 *      (AccountManager)context.getSystemService(Context.ACCOUNT_SERVICE)

 * @hide

 */

public class AccountManagerService extends IAccountManager.Stub {

public class AccountManagerService

        extends IAccountManager.Stub

        implements RegisteredServicesCacheListener {

    private static final String TAG = "AccountManagerService";



    private static final int TIMEOUT_DELAY_MS = 1000 * 60;
@@ -209,11 +212,41 @@ public class AccountManagerService extends IAccountManager.Stub { 
        mMessageHandler = new MessageHandler(mMessageThread.getLooper());



        mAuthenticatorCache = new AccountAuthenticatorCache(mContext);

        mAuthenticatorCache.setListener(this);

        mBindHelper = new AuthenticatorBindHelper(mContext, mAuthenticatorCache, mMessageHandler,

                MESSAGE_CONNECTED, MESSAGE_DISCONNECTED);



        mSimWatcher = new SimWatcher(mContext);

        sThis.set(this);



        onRegisteredServicesCacheChanged();

    }



    public void onRegisteredServicesCacheChanged() {

        boolean accountDeleted = false;

        SQLiteDatabase db = mOpenHelper.getWritableDatabase();

        Cursor cursor = db.query(TABLE_ACCOUNTS,

                new String[]{ACCOUNTS_ID, ACCOUNTS_TYPE, ACCOUNTS_NAME},

                null, null, null, null, null);

        try {

            while (cursor.moveToNext()) {

                final long accountId = cursor.getLong(0);

                final String accountType = cursor.getString(1);

                final String accountName = cursor.getString(2);

                if (mAuthenticatorCache.getServiceInfo(AuthenticatorDescription.newKey(accountType))

                        == null) {

                    Log.d(TAG, "deleting account " + accountName + " because type "

                            + accountType + " no longer has a registered authenticator");

                    db.delete(TABLE_ACCOUNTS, ACCOUNTS_ID + "=" + accountId, null);

                    accountDeleted= true;

                }

            }

        } finally {

            cursor.close();

            if (accountDeleted) {

                sendAccountsChangedBroadcast();

            }

        }

    }



    public String getPassword(Account account) {
@@ -533,15 +566,19 @@ public class AccountManagerService extends IAccountManager.Stub { 
        checkAuthenticateAccountsPermission(account);

        long identityToken = clearCallingIdentity();

        try {

            setPasswordInDB(account, password);

        } finally {

            restoreCallingIdentity(identityToken);

        }

    }



    private void setPasswordInDB(Account account, String password) {

        ContentValues values = new ContentValues();

        values.put(ACCOUNTS_PASSWORD, password);

        mOpenHelper.getWritableDatabase().update(TABLE_ACCOUNTS, values,

                ACCOUNTS_NAME + "=? AND " + ACCOUNTS_TYPE+ "=?",

                new String[]{account.name, account.type});

        sendAccountsChangedBroadcast();

        } finally {

            restoreCallingIdentity(identityToken);

        }

    }



    private void sendAccountsChangedBroadcast() {
@@ -552,7 +589,7 @@ public class AccountManagerService extends IAccountManager.Stub { 
        checkManageAccountsPermission();

        long identityToken = clearCallingIdentity();

        try {

            setPassword(account, null);

            setPasswordInDB(account, null);

        } finally {

            restoreCallingIdentity(identityToken);

        }

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

+14 −0
Original line number Diff line number Diff line
@@ -53,6 +53,16 @@ public abstract class RegisteredServicesCache<V> { 
    private final String mMetaDataName;

    private final String mAttributesName;



    public RegisteredServicesCacheListener getListener() {

        return mListener;

    }



    public void setListener(RegisteredServicesCacheListener listener) {

        mListener = listener;

    }



    private volatile RegisteredServicesCacheListener mListener;



    // no need to be synchronized since the map is never changed once mService is written

    volatile Map<V, ServiceInfo<V>> mServices;
@@ -84,6 +94,10 @@ public abstract class RegisteredServicesCache<V> { 
                        @Override

                        public void onReceive(Context context, Intent intent) {

                            mServices = generateServicesMap();

                            RegisteredServicesCacheListener listener = mListener;

                            if (listener != null) {

                                listener.onRegisteredServicesCacheChanged();

                            }

                        }

                    };

                }

core/java/android/content/pm/RegisteredServicesCacheListener.java

0 → 100644
+11 −0
Original line number Diff line number Diff line 
package android.content.pm;



/**

 * Listener for changes to the set of registered services managed by a RegisteredServicesCache.

 */

public interface RegisteredServicesCacheListener {

    /**

     * Invoked when the registered services cache changes.

     */

    void onRegisteredServicesCacheChanged();

}