am 04f2391d: am 61066c13: Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev

* commit '04f2391d17ce994b6d1da5907c7b5010621091b2':
  [New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API
This commit is contained in:
Simranjit Singh Kohli
2014-12-02 19:31:26 +00:00
committed by Android Git Automerger

View File

@@ -91,20 +91,20 @@ public class AccountSyncSettings extends AccountPreferenceBase {
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// TODO: We need an API to remove an account from a different user.
// See: http://b/15466880
AccountManager.get(AccountSyncSettings.this.getActivity())
.removeAccountAsUser(mAccount,
new AccountManagerCallback<Boolean>() {
Activity activity = getActivity();
AccountManager.get(activity)
.removeAccountAsUser(mAccount, activity,
new AccountManagerCallback<Bundle>() {
@Override
public void run(AccountManagerFuture<Boolean> future) {
public void run(AccountManagerFuture<Bundle> future) {
// If already out of this screen, don't proceed.
if (!AccountSyncSettings.this.isResumed()) {
return;
}
boolean failed = true;
try {
if (future.getResult() == true) {
if (future.getResult()
.getBoolean(AccountManager.KEY_BOOLEAN_RESULT)) {
failed = false;
}
} catch (OperationCanceledException e) {