Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove account name from logs in ChooseAccount activities."

Browse Source
This commit is contained in:
Dmitry Dementyev
2021-12-24 00:23:40 +00:00
committed by Android (Google) Code Review
parent dd4769c8d4 4361f23443
commit 142f6a9bc6
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/accounts/ChooseAccountActivity.java
View File

@@ -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);

13
core/java/android/accounts/ChooseTypeAndAccountActivity.java
View File

@@ -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<Account, Integer> 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();
}