Merge change Ie905f9b5 into eclair
* changes:
Add support for xdpi and ydpi in the device config for the GLE.
diff --git a/apps/Development/src/com/android/development/AccountsTester.java b/apps/Development/src/com/android/development/AccountsTester.java
index 2525f4a..0087695 100644
--- a/apps/Development/src/com/android/development/AccountsTester.java
+++ b/apps/Development/src/com/android/development/AccountsTester.java
@@ -40,7 +40,7 @@
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 @@
@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 @@
} 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 @@
}
};
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 @@
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) {
diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index 7b75a68..04fcf99 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -94,6 +94,13 @@
class="com.android.unit_tests.activity.ActivityTests"
coverage_target="framework" />
+<test name="keystore-unit"
+ build_path="frameworks/base/keystore/tests"
+ package="android.security.tests"
+ runner=".KeyStoreTestRunner"
+ coverage_target="framework"
+ continuous="true" />
+
<test name="vpntests"
build_path="frameworks/base/tests/AndroidTests"
package="com.android.unit_tests"
@@ -514,12 +521,6 @@
description="Android STL."
extra_build_args="ASTL_TESTS=1" />
-<!-- Android Keystore tests -->
-<test-native name="netkeystore_test"
- build_path="frameworks/base/cmds/keystore/tests"
- description="Android keystore."
- extra_build_args="KEYSTORE_TESTS=1" />
-
<!-- pending patch 820
<test-native name="gtest"
build_path="external/gtest"