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

Commit a5fb0829 authored by Dmitry Dementyev's avatar Dmitry Dementyev
Browse files

Remove hidden shared account methods from AccountManager.java 

Bug: 145207098,145206763,145206842
Test: CTS
Change-Id: I0d07e0e6c4377eff5756ee938c5b43ad632249df
(cherry picked from commit b6907622)
parent 4bfd23eb

core/java/android/accounts/AccountManager.java

+0 −29
Original line number Diff line number Diff line
@@ -1942,35 +1942,6 @@ public class AccountManager { 
        }.start();

    }



    /**

     * @hide

     * Removes the shared account.

     * @param account the account to remove

     * @param user the user to remove the account from

     * @return

     */

    public boolean removeSharedAccount(final Account account, UserHandle user) {

        try {

            boolean val = mService.removeSharedAccountAsUser(account, user.getIdentifier());

            return val;

        } catch (RemoteException re) {

            throw re.rethrowFromSystemServer();

        }

    }



    /**

     * @hide

     * @param user

     * @return

     */

    public Account[] getSharedAccounts(UserHandle user) {

        try {

            return mService.getSharedAccountsAsUser(user.getIdentifier());

        } catch (RemoteException re) {

            throw re.rethrowFromSystemServer();

        }

    }



    /**

     * Confirms that the user knows the password for an account to make extra

     * sure they are the owner of the account.  The user-entered password can

core/java/android/accounts/IAccountManager.aidl

+0 −3
Original line number Diff line number Diff line
@@ -80,14 +80,11 @@ interface IAccountManager { 
        String authTokenType);



    /* Shared accounts */

    Account[] getSharedAccountsAsUser(int userId);

    boolean removeSharedAccountAsUser(in Account account, int userId);

    void addSharedAccountsFromParentUser(int parentUserId, int userId, String opPackageName);



    /* Account renaming. */

    void renameAccount(in IAccountManagerResponse response, in Account accountToRename, String newName);

    String getPreviousName(in Account account);

    boolean renameSharedAccountAsUser(in Account accountToRename, String newName, int userId);



    /* Add account in two steps. */

    void startAddAccountSession(in IAccountManagerResponse response, String accountType,

services/core/java/com/android/server/accounts/AccountManagerService.java

+0 −3
Original line number Diff line number Diff line
@@ -4404,7 +4404,6 @@ public class AccountManagerService 
        return true;

    }



    @Override

    public boolean renameSharedAccountAsUser(Account account, String newName, int userId) {

        userId = handleIncomingUser(userId);

        UserAccounts accounts = getUserAccounts(userId);
@@ -4420,7 +4419,6 @@ public class AccountManagerService 
        return r > 0;

    }



    @Override

    public boolean removeSharedAccountAsUser(Account account, int userId) {

        return removeSharedAccountAsUser(account, userId, getCallingUid());

    }
@@ -4438,7 +4436,6 @@ public class AccountManagerService 
        return deleted;

    }



    @Override

    public Account[] getSharedAccountsAsUser(int userId) {

        userId = handleIncomingUser(userId);

        UserAccounts accounts = getUserAccounts(userId);