Merge change 25296 into eclair

* changes:
  Add new Gservices setting for discarding uphill ops for eclair and future devices.
This commit is contained in:
Android (Google) Code Review
2009-09-16 14:16:47 -04:00

View File

@ -2758,10 +2758,18 @@ public final class Settings {
/**
* Controls whether Gmail will discard uphill operations that repeatedly fail. Value must be
* an integer where non-zero means true. Defaults to 1.
* an integer where non-zero means true. Defaults to 1. This flag controls Donut devices.
*/
public static final String GMAIL_DISCARD_ERROR_UPHILL_OP = "gmail_discard_error_uphill_op";
/**
* Controls whether Gmail will discard uphill operations that repeatedly fail. Value must be
* an integer where non-zero means true. Defaults to 1. This flag controls Eclair and
* future devices.
*/
public static final String GMAIL_DISCARD_ERROR_UPHILL_OP_NEW =
"gmail_discard_error_uphill_op_new";
/**
* Controls how many attempts Gmail will try to upload an uphill operations before it
* abandons the operation. Defaults to 20.