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

Merge "fix a system crash that occurs when ChooseAccountActivity is restarted from the icicle"

Browse Source
This commit is contained in:
Fred Quintana
2010-03-01 14:47:22 -08:00
committed by Android (Google) Code Review
parent 61c9d4b450 262226137d
commit aceb6fe23e
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,14 +36,15 @@ public class ChooseAccountActivity extends ListActivity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (savedInstanceState == null) {
mAccounts = getIntent().getParcelableArrayExtra(AccountManager.KEY_ACCOUNTS);
mAccountManagerResponse =
getIntent().getParcelableExtra(AccountManager.KEY_ACCOUNT_MANAGER_RESPONSE);
} else {
mAccounts = savedInstanceState.getParcelableArray(AccountManager.KEY_ACCOUNTS);
mAccountManagerResponse =
savedInstanceState.getParcelable(AccountManager.KEY_ACCOUNT_MANAGER_RESPONSE);
mAccounts = getIntent().getParcelableArrayExtra(AccountManager.KEY_ACCOUNTS);
mAccountManagerResponse =
getIntent().getParcelableExtra(AccountManager.KEY_ACCOUNT_MANAGER_RESPONSE);
// KEY_ACCOUNTS is a required parameter
if (mAccounts == null) {
setResult(RESULT_CANCELED);
finish();
return;
}
String[] mAccountNames = new String[mAccounts.length];