ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Use new public API to protect force account creation." into honeycomb

Browse Source
This commit is contained in:
Brett Chabot 2011-01-09 16:35:51 -08:00 committed by Android (Google) Code Review
commit 85985b5db3
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/email/activity/setup/AccountSetupBasics.java
View File

@ -71,11 +71,11 @@ import java.util.concurrent.FutureTask;
* *
* === Support for automated testing == * === Support for automated testing ==
* This activity can also be launched directly via ACTION_CREATE_ACCOUNT. This is intended * This activity can also be launched directly via ACTION_CREATE_ACCOUNT. This is intended
* only for use by continuous test systems, and is currently only available when "ro.monkey" * only for use by continuous test systems, and is currently only available when
* is set. To use this mode, you must construct an intent which contains all necessary information * {@link ActivityManager#isRunningInTestHarness()} is set. To use this mode, you must construct
* to create the account. No connection checking is done, so the account may or may not actually * an intent which contains all necessary information to create the account. No connection
* work. Here is a sample command, for a gmail account "test_account" with a password of * checking is done, so the account may or may not actually work. Here is a sample command, for a
* "test_password". * gmail account "test_account" with a password of "test_password".
* *
* $ adb shell am start -a com.android.email.CREATE_ACCOUNT \ * $ adb shell am start -a com.android.email.CREATE_ACCOUNT \
* -e EMAIL test_account@gmail.com \ * -e EMAIL test_account@gmail.com \
@ -100,7 +100,7 @@ public class AccountSetupBasics extends AccountSetupActivity
private final String EXTRA_CREATE_ACCOUNT_USER = "USER"; private final String EXTRA_CREATE_ACCOUNT_USER = "USER";
private final String EXTRA_CREATE_ACCOUNT_INCOMING = "INCOMING"; private final String EXTRA_CREATE_ACCOUNT_INCOMING = "INCOMING";
private final String EXTRA_CREATE_ACCOUNT_OUTGOING = "OUTGOING"; private final String EXTRA_CREATE_ACCOUNT_OUTGOING = "OUTGOING";
private final Boolean DEBUG_ALLOW_NON_MONKEY_CREATION = true; // STOPSHIP - must be FALSE private final Boolean DEBUG_ALLOW_NON_TEST_HARNESS_CREATION = false;
private final static String STATE_KEY_PROVIDER = "AccountSetupBasics.provider"; private final static String STATE_KEY_PROVIDER = "AccountSetupBasics.provider";
@ -262,8 +262,10 @@ public class AccountSetupBasics extends AccountSetupActivity
// Handle force account creation immediately (now that fragment is set up) // Handle force account creation immediately (now that fragment is set up)
// This is never allowed in a normal user build and will exit immediately. // This is never allowed in a normal user build and will exit immediately.
if (SetupData.getFlowMode() == SetupData.FLOW_MODE_FORCE_CREATE) { if (SetupData.getFlowMode() == SetupData.FLOW_MODE_FORCE_CREATE) {
if (!DEBUG_ALLOW_NON_MONKEY_CREATION && !ActivityManager.isUserAMonkey()) { if (!DEBUG_ALLOW_NON_TEST_HARNESS_CREATION &&
Log.e(Email.LOG_TAG, "ERROR: Force account create only allowed for monkeys"); !ActivityManager.isRunningInTestHarness()) {
Log.e(Email.LOG_TAG,
"ERROR: Force account create only allowed while in test harness");
finish(); finish();
return; return;
} }