diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/accounts/ChooseAccountTypeActivity.java | 4 | ||||
| -rw-r--r-- | core/java/android/accounts/ChooseTypeAndAccountActivity.java | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/java/android/accounts/ChooseAccountTypeActivity.java b/core/java/android/accounts/ChooseAccountTypeActivity.java index f53e6f3..5239e8c 100644 --- a/core/java/android/accounts/ChooseAccountTypeActivity.java +++ b/core/java/android/accounts/ChooseAccountTypeActivity.java @@ -56,10 +56,10 @@ public class ChooseAccountTypeActivity extends Activity implements AccountManage // Read the validAccountTypes, if present, and add them to the setOfAllowableAccountTypes Set<String> setOfAllowableAccountTypes = null; - ArrayList<String> validAccountTypes = getIntent().getStringArrayListExtra( + String[] validAccountTypes = getIntent().getStringArrayExtra( ChooseTypeAndAccountActivity.EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY); if (validAccountTypes != null) { - setOfAllowableAccountTypes = new HashSet<String>(validAccountTypes.size()); + setOfAllowableAccountTypes = new HashSet<String>(validAccountTypes.length); for (String type : validAccountTypes) { setOfAllowableAccountTypes.add(type); } diff --git a/core/java/android/accounts/ChooseTypeAndAccountActivity.java b/core/java/android/accounts/ChooseTypeAndAccountActivity.java index b4030b9..852c4dd 100644 --- a/core/java/android/accounts/ChooseTypeAndAccountActivity.java +++ b/core/java/android/accounts/ChooseTypeAndAccountActivity.java @@ -141,10 +141,10 @@ public class ChooseTypeAndAccountActivity extends Activity { // Read the validAccountTypes, if present, and add them to the setOfAllowableAccountTypes Set<String> setOfAllowableAccountTypes = null; - final ArrayList<String> validAccountTypes = - intent.getStringArrayListExtra(EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY); + final String[] validAccountTypes = + intent.getStringArrayExtra(EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY); if (validAccountTypes != null) { - setOfAllowableAccountTypes = new HashSet<String>(validAccountTypes.size()); + setOfAllowableAccountTypes = new HashSet<String>(validAccountTypes.length); for (String type : validAccountTypes) { setOfAllowableAccountTypes.add(type); } @@ -266,14 +266,14 @@ public class ChooseTypeAndAccountActivity extends Activity { private void startChooseAccountTypeActivity() { final Intent intent = new Intent(this, ChooseAccountTypeActivity.class); - intent.putStringArrayListExtra(EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY, - getIntent().getStringArrayListExtra(EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY)); + intent.putExtra(EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY, + getIntent().getStringArrayExtra(EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY)); intent.putExtra(EXTRA_ADD_ACCOUNT_OPTIONS_BUNDLE, getIntent().getBundleExtra(EXTRA_ADD_ACCOUNT_OPTIONS_BUNDLE)); intent.putExtra(EXTRA_ADD_ACCOUNT_REQUIRED_FEATURES_STRING_ARRAY, getIntent().getStringArrayExtra(EXTRA_ADD_ACCOUNT_REQUIRED_FEATURES_STRING_ARRAY)); intent.putExtra(EXTRA_ADD_ACCOUNT_AUTH_TOKEN_TYPE_STRING, - getIntent().getStringArrayExtra(EXTRA_ADD_ACCOUNT_AUTH_TOKEN_TYPE_STRING)); + getIntent().getStringExtra(EXTRA_ADD_ACCOUNT_AUTH_TOKEN_TYPE_STRING)); startActivityForResult(intent, 0); } |