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

Commit 4361f234 authored by Dmitry Dementyev's avatar Dmitry Dementyev
Browse files

Remove account name from logs in ChooseAccount activities. 

Test: manual
Bug: 207388203, 205130113
Change-Id: I25eeaa9e7f0b79703949bd91eb8cca04034e5ba7
parent c80225d7

core/java/android/accounts/ChooseAccountActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/accounts/ChooseTypeAndAccountActivity.java

+4 −9
Original line number Diff line number Diff line
@@ -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,7 +420,7 @@ public class ChooseTypeAndAccountActivity extends Activity 
    }



    private void onAccountSelected(Account account) {

      Log.d(TAG, "selected account " + account);

        Log.d(TAG, "selected account " + account.toSafeString());

        setResultAndFinish(account.name, account.type);

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

    }