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

Merge "Fix account picker crash when there is no account before."

Browse Source
This commit is contained in:
Lei Yu
2016-12-12 21:06:11 +00:00
committed by Android (Google) Code Review
parent 1a71c05c7c 9134548ea4
commit 4eba3954e2
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/dashboard/SupportItemAdapter.java
View File

@@ -170,8 +170,13 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
public void setAccounts(Account accounts[]) { public void setAccounts(Account accounts[]) {
if (!Arrays.equals(mAccounts, accounts)) { if (!Arrays.equals(mAccounts, accounts)) {
int index = ArrayUtils.indexOf(accounts, mAccounts[mSelectedAccountIndex]); if (mAccounts.length == 0) {
mSelectedAccountIndex = index != -1 ? index : 0; mSelectedAccountIndex = 0;
} else {
final int index = ArrayUtils.indexOf(accounts, mAccounts[mSelectedAccountIndex]);
mSelectedAccountIndex = index != -1 ? index : 0;
}
mAccounts = accounts; mAccounts = accounts;
mSupportFeatureProvider.refreshOperationRules(); mSupportFeatureProvider.refreshOperationRules();
refreshEscalationCards(); refreshEscalationCards();

13
tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java
View File

@@ -51,6 +51,7 @@ public class SupportItemAdapterTest {
private final Account USER_2 = new Account("user2", ACCOUNT_TYPE); private final Account USER_2 = new Account("user2", ACCOUNT_TYPE);
private final Account TWO_ACCOUNTS[] = {USER_1, USER_2}; private final Account TWO_ACCOUNTS[] = {USER_1, USER_2};
private final Account ONE_ACCOUNT[] = {USER_1}; private final Account ONE_ACCOUNT[] = {USER_1};
private final Account ZERO_ACCOUNT[] = {};
private ShadowActivity mShadowActivity; private ShadowActivity mShadowActivity;
private Activity mActivity; private Activity mActivity;
@@ -98,6 +99,18 @@ public class SupportItemAdapterTest {
verify(mSupportFeatureProvider).getAccountLoginIntent(); verify(mSupportFeatureProvider).getAccountLoginIntent();
} }
@Test
public void testSetAccount_AccountEmpty_NotCrash() {
when(mSupportFeatureProvider.getSupportEligibleAccounts(mActivity)).thenReturn(ZERO_ACCOUNT);
mSupportItemAdapter = new SupportItemAdapter(mActivity, null, mSupportFeatureProvider,
mMetricsFeatureProvider, null);
// Should not crash in this method
mSupportItemAdapter.setAccounts(ONE_ACCOUNT);
verify(mSupportFeatureProvider).getSupportEligibleAccounts(mActivity);
}
/** /**
* Check after {@link SupportItemAdapter#bindAccountPicker(SupportItemAdapter.ViewHolder)} is * Check after {@link SupportItemAdapter#bindAccountPicker(SupportItemAdapter.ViewHolder)} is
* invoked, whether the spinner in {@paramref viewHolder} has all the data from {@paramref * invoked, whether the spinner in {@paramref viewHolder} has all the data from {@paramref