From 5330b5a78c7380a1b7c7b717aed2d240cd97530e Mon Sep 17 00:00:00 2001 From: tiansiming Date: Fri, 13 Oct 2017 10:57:25 +0800 Subject: [PATCH] Remove "result2" in AccountManagerService I think result2 here is to filter out other value returned from getAccountRemovalAllowed. As the annotation shown in getAccountRemovalAllowed in AbstractAccountAuthenticator, the result will only contain KEY_INTENT or KEY_BOOLEAN_RESULT or KEY_ERROR_CODE and KEY_ERROR_MESSAGE. KEY_INTENT has been judged at the beginning of onResult, KEY_ERROR_CODE and KEY_ERROR_MESSAGE seem extraneous when back to AccountManager, so i believe that it's ok to use result directly here other than get one more Bundle object. (tip: if result2 is nessesary, its name doesn't looks formal) Bug:N/A Test:N/A Change-Id: I4e352baa1e74ac680398c328db0c4bc873ba528b Signed-off-by: tiansiming --- .../com/android/server/accounts/AccountManagerService.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index d6a010fc01b38..fd7acdf633890 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -2233,12 +2233,10 @@ public class AccountManagerService Log.v(TAG, getClass().getSimpleName() + " calling onResult() on response " + response); } - Bundle result2 = new Bundle(); - result2.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, removalAllowed); try { - response.onResult(result2); + response.onResult(result); } catch (RemoteException e) { - // ignore + Slog.e(TAG, "Error calling onResult()", e); } } }