PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not finish activity when the input account doesn't exist"

Browse Source
This commit is contained in:
Jason Chiu
2023-07-05 07:15:22 +00:00
committed by Android (Google) Code Review
parent 225af2b43f e01a9b6039
commit 8ecbe486f8
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/accounts/ChooseAccountPreferenceController.java
View File

@@ -50,6 +50,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.StringJoiner;
/** /**
* An extra {@link UserHandle} can be specified in the intent as {@link EXTRA_USER}, if the user for * An extra {@link UserHandle} can be specified in the intent as {@link EXTRA_USER}, if the user for
@@ -189,7 +190,7 @@ public class ChooseAccountPreferenceController extends BasePreferenceController
mScreen.addPreference(p); mScreen.addPreference(p);
} }
} else { } else {
if (Log.isLoggable(TAG, Log.VERBOSE)) { if (mAuthorities != null && Log.isLoggable(TAG, Log.VERBOSE)) {
final StringBuilder auths = new StringBuilder(); final StringBuilder auths = new StringBuilder();
for (String a : mAuthorities) { for (String a : mAuthorities) {
auths.append(a); auths.append(a);
@@ -197,8 +198,14 @@ public class ChooseAccountPreferenceController extends BasePreferenceController
} }
Log.v(TAG, "No providers found for authorities: " + auths); Log.v(TAG, "No providers found for authorities: " + auths);
} }
if (mAccountTypesFilter != null) {
final StringJoiner types = new StringJoiner(", ", "", "");
mAccountTypesFilter.forEach(types::add);
Log.w(TAG, "No providers found for account types: " + types);
}
mActivity.setResult(RESULT_CANCELED); mActivity.setResult(RESULT_CANCELED);
mActivity.finish(); // Do not finish activity to avoid the caller getting the existing account list because
// the prompt respond reveals that the input account does not exist.
} }
} }

2
tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java
View File

@@ -173,7 +173,7 @@ public class ChooseAccountPreferenceControllerTest {
mActivity); mActivity);
mController.displayPreference(mPreferenceScreen); mController.displayPreference(mPreferenceScreen);
assertThat(mActivity.isFinishing()).isTrue(); assertThat(mActivity.isFinishing()).isFalse();
assertThat(mPreferenceScreen.getPreferenceCount()).isEqualTo(0); assertThat(mPreferenceScreen.getPreferenceCount()).isEqualTo(0);
} }