From 4361f23443ed684f8faaaf7da54288c575018b01 Mon Sep 17 00:00:00 2001 From: Dmitry Dementyev Date: Wed, 22 Dec 2021 12:59:58 -0800 Subject: [PATCH] Remove account name from logs in ChooseAccount activities. Test: manual Bug: 207388203, 205130113 Change-Id: I25eeaa9e7f0b79703949bd91eb8cca04034e5ba7 --- .../android/accounts/ChooseAccountActivity.java | 2 +- .../accounts/ChooseTypeAndAccountActivity.java | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/core/java/android/accounts/ChooseAccountActivity.java b/core/java/android/accounts/ChooseAccountActivity.java index bc7f4d681e273..6c8744f288640 100644 --- a/core/java/android/accounts/ChooseAccountActivity.java +++ b/core/java/android/accounts/ChooseAccountActivity.java @@ -148,7 +148,7 @@ public class ChooseAccountActivity extends Activity { am.setAccountVisibility(account, mCallingPackage, AccountManager.VISIBILITY_USER_MANAGED_VISIBLE); } - Log.d(TAG, "selected account " + account); + Log.d(TAG, "selected account " + account.toSafeString()); Bundle bundle = new Bundle(); bundle.putString(AccountManager.KEY_ACCOUNT_NAME, account.name); bundle.putString(AccountManager.KEY_ACCOUNT_TYPE, account.type); diff --git a/core/java/android/accounts/ChooseTypeAndAccountActivity.java b/core/java/android/accounts/ChooseTypeAndAccountActivity.java index 2be88ab60a1e1..2e9f73ca388e7 100644 --- a/core/java/android/accounts/ChooseTypeAndAccountActivity.java +++ b/core/java/android/accounts/ChooseTypeAndAccountActivity.java @@ -190,10 +190,6 @@ public class ChooseTypeAndAccountActivity extends Activity mAccounts = getAcceptableAccountChoices(AccountManager.get(this)); } - if (Log.isLoggable(TAG, Log.VERBOSE)) { - Log.v(TAG, "selected account name is " + mSelectedAccountName); - } - mPossiblyVisibleAccounts = new ArrayList<>(mAccounts.size()); for (Map.Entry entry : mAccounts.entrySet()) { if (AccountManager.VISIBILITY_NOT_VISIBLE != entry.getValue()) { @@ -302,7 +298,7 @@ public class ChooseTypeAndAccountActivity extends Activity if (data != null && data.getExtras() != null) data.getExtras().keySet(); Bundle extras = data != null ? data.getExtras() : null; Log.v(TAG, "ChooseTypeAndAccountActivity.onActivityResult(reqCode=" + requestCode - + ", resCode=" + resultCode + ", extras=" + extras + ")"); + + ", resCode=" + resultCode + ")"); } // we got our result, so clear the fact that we had a pending request @@ -424,8 +420,8 @@ public class ChooseTypeAndAccountActivity extends Activity } private void onAccountSelected(Account account) { - Log.d(TAG, "selected account " + account); - setResultAndFinish(account.name, account.type); + Log.d(TAG, "selected account " + account.toSafeString()); + setResultAndFinish(account.name, account.type); } private void setResultAndFinish(final String accountName, final String accountType) { @@ -451,9 +447,8 @@ public class ChooseTypeAndAccountActivity extends Activity setResult(Activity.RESULT_OK, new Intent().putExtras(bundle)); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "ChooseTypeAndAccountActivity.setResultAndFinish: selected account " - + accountName + ", " + accountType); + + account.toSafeString()); } - finish(); }