summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-08-11 20:06:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-08-11 20:06:53 -0700
commit50558faf8e9f343962c0de3dd0c52b96540f0651 (patch)
tree07ede1da74955435a1d8bbeeab95ead0ffc64799 /core
parentd9aaed53ffda9541bf7e1e7e3c3bfc094da23080 (diff)
parentc030a48c1e9e2923e8dee320dd3085dc3324b9a4 (diff)
downloadframeworks_base-50558faf8e9f343962c0de3dd0c52b96540f0651.zip
frameworks_base-50558faf8e9f343962c0de3dd0c52b96540f0651.tar.gz
frameworks_base-50558faf8e9f343962c0de3dd0c52b96540f0651.tar.bz2
Merge change 20700
* changes: add gservices setting for switching sync subscriptions to use a new routing info.
Diffstat (limited to 'core')
-rw-r--r--core/java/android/provider/Settings.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index cf26b1b..e1b8e99 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2947,6 +2947,11 @@ public final class Settings {
public static final String DATA_MESSAGE_GET_APP_TOKEN_URL =
"data_messaging_get_app_token_url";
+ /**
+ * Use android://&lt;it&gt; routing infos for Google Sync Server subcriptions.
+ */
+ public static final String GSYNC_USE_RMQ2_ROUTING_INFO = "gsync_use_rmq2_routing_info";
+
/**
* Enable use of ssl session caching.
* 'db' - save each session in a (per process) database