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

Commit 3084a6f8 authored by Fred Quintana's avatar Fred Quintana
Browse files

rename testHasFeatures to hasFeatures

parent 013b9c24

api/current.xml

+19 −19
Original line number Diff line number Diff line
@@ -14581,6 +14581,25 @@ 
<parameter name="key" type="java.lang.String">

</parameter>

</method>

<method name="hasFeatures"

 return="android.accounts.AccountManagerFuture&lt;java.lang.Boolean&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="account" type="android.accounts.Account">

</parameter>

<parameter name="features" type="java.lang.String[]">

</parameter>

<parameter name="callback" type="android.accounts.AccountManagerCallback&lt;java.lang.Boolean&gt;">

</parameter>

<parameter name="handler" type="android.os.Handler">

</parameter>

</method>

<method name="invalidateAuthToken"

 return="void"

 abstract="false"
@@ -14690,25 +14709,6 @@ 
<parameter name="value" type="java.lang.String">

</parameter>

</method>

<method name="testHasFeatures"

 return="android.accounts.AccountManagerFuture&lt;java.lang.Boolean&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="account" type="android.accounts.Account">

</parameter>

<parameter name="features" type="java.lang.String[]">

</parameter>

<parameter name="callback" type="android.accounts.AccountManagerCallback&lt;java.lang.Boolean&gt;">

</parameter>

<parameter name="handler" type="android.os.Handler">

</parameter>

</method>

<method name="updateCredentials"

 return="android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt;"

 abstract="false"

core/java/android/accounts/AccountManager.java

+2 −2
Original line number Diff line number Diff line
@@ -254,12 +254,12 @@ public class AccountManager { 
     * The future result is a {@link Boolean} that is true if the account exists and has the

     * specified features.

     */

    public AccountManagerFuture<Boolean> testHasFeatures(final Account account,

    public AccountManagerFuture<Boolean> hasFeatures(final Account account,

            final String[] features,

            AccountManagerCallback<Boolean> callback, Handler handler) {

        return new Future2Task<Boolean>(handler, callback) {

            public void doWork() throws RemoteException {

                mService.testHasFeatures(mResponse, account, features);

                mService.hasFeatures(mResponse, account, features);

            }

            public Boolean bundleToResult(Bundle bundle) throws AuthenticatorException {

                if (!bundle.containsKey(KEY_BOOLEAN_RESULT)) {

core/java/android/accounts/AccountManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ public class AccountManagerService 
        return db.insert(TABLE_EXTRAS, EXTRAS_KEY, values);

    }



    public void testHasFeatures(IAccountManagerResponse response,

    public void hasFeatures(IAccountManagerResponse response,

            Account account, String[] features) {

        checkReadAccountsPermission();

        long identityToken = clearCallingIdentity();
@@ -501,7 +501,7 @@ public class AccountManagerService 
        }



        protected String toDebugString(long now) {

            return super.toDebugString(now) + ", testHasFeatures"

            return super.toDebugString(now) + ", hasFeatures"

                    + ", " + mAccount

                    + ", " + (mFeatures != null ? TextUtils.join(",", mFeatures) : null);

        }

core/java/android/accounts/IAccountManager.aidl

+2 −3
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ interface IAccountManager { 
    String getUserData(in Account account, String key);

    AuthenticatorDescription[] getAuthenticatorTypes();

    Account[] getAccounts(String accountType);

    void testHasFeatures(in IAccountManagerResponse response, in Account account,

        in String[] features);

    void hasFeatures(in IAccountManagerResponse response, in Account account, in String[] features);

    void getAccountsByFeatures(in IAccountManagerResponse response, String accountType, in String[] features);

    boolean addAccount(in Account account, String password, in Bundle extras);

    void removeAccount(in IAccountManagerResponse response, in Account account);