diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-30 01:43:32 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-30 01:43:32 -0400 |
| commit | aa3eaa70576530ff5db2de921164af847c7a7c86 (patch) | |
| tree | 51bfe048ecee5c5eb7d0ddb76aece7a8c9cb0d58 /apps | |
| parent | 84dcb451c210d6e93f5f516c27b781c067544895 (diff) | |
| parent | 6c9579e7091310d7966b07ec1d019fdce2a0996e (diff) | |
| download | android_development-aa3eaa70576530ff5db2de921164af847c7a7c86.tar.gz android_development-aa3eaa70576530ff5db2de921164af847c7a7c86.tar.bz2 android_development-aa3eaa70576530ff5db2de921164af847c7a7c86.zip | |
Merge change I343737c9 into eclair
* changes:
Remove GAIA string
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Development/src/com/android/development/AccountsTester.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/Development/src/com/android/development/AccountsTester.java b/apps/Development/src/com/android/development/AccountsTester.java index 2525f4a6b..00876957d 100644 --- a/apps/Development/src/com/android/development/AccountsTester.java +++ b/apps/Development/src/com/android/development/AccountsTester.java @@ -40,7 +40,7 @@ public class AccountsTester extends Activity implements OnAccountsUpdatedListene private ListView mAuthenticatorsListView; private AccountManager mAccountManager; private String mLongPressedAccount = null; - private static final String COM_GOOGLE_GAIA = "com.google.GAIA"; + private static final String COM_GOOGLE = "com.google"; private AuthenticatorDescription[] mAuthenticatorDescs; private static final int GET_AUTH_TOKEN_DIALOG_ID = 1; @@ -255,7 +255,7 @@ public class AccountsTester extends Activity implements OnAccountsUpdatedListene @Override public boolean onContextItemSelected(MenuItem item) { if (item.getItemId() == R.id.accounts_tester_remove_account) { - final Account account = new Account(mLongPressedAccount, COM_GOOGLE_GAIA); + final Account account = new Account(mLongPressedAccount, COM_GOOGLE); mAccountManager.removeAccount(account, new AccountManagerCallback<Boolean>() { public void run(AccountManagerFuture<Boolean> future) { try { @@ -273,7 +273,7 @@ public class AccountsTester extends Activity implements OnAccountsUpdatedListene } else if (item.getItemId() == R.id.accounts_tester_update_credentials) { showDialog(UPDATE_CREDENTIALS_DIALOG_ID); } else if (item.getItemId() == R.id.accounts_tester_confirm_credentials) { - mAccountManager.confirmCredentials(new Account(mLongPressedAccount, COM_GOOGLE_GAIA), + mAccountManager.confirmCredentials(new Account(mLongPressedAccount, COM_GOOGLE), AccountsTester.this, new ConfirmCredentialsCallback(), null /* handler */); } return true; @@ -308,7 +308,7 @@ public class AccountsTester extends Activity implements OnAccountsUpdatedListene } }; final Account account = new Account(mLongPressedAccount, - COM_GOOGLE_GAIA); + COM_GOOGLE); if (id == GET_AUTH_TOKEN_DIALOG_ID) { mAccountManager.getAuthToken(account, authTokenType, null /* loginOptions */, AccountsTester.this, @@ -402,7 +402,7 @@ public class AccountsTester extends Activity implements OnAccountsUpdatedListene try { Bundle bundle = future.getResult(); String authToken = bundle.getString(Constants.AUTHTOKEN_KEY); - mAccountManager.invalidateAuthToken(COM_GOOGLE_GAIA, authToken); + mAccountManager.invalidateAuthToken(COM_GOOGLE, authToken); } catch (OperationCanceledException e) { Log.d(TAG, "invalidate: interrupted while getting authToken"); } catch (IOException e) { |