summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-20 15:22:02 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-05-20 15:22:02 -0700
commit009b32dc8b9c32160e02a63b60636854f0ceb86f (patch)
treeaefc190472b190f31853c1bb324b48023b742fd7
parenta6cd4e03e6bde0c4b76ad7290eb2c527398478d1 (diff)
parentb84905662f85e6c42236fa1d2792f6e0a53c88e8 (diff)
downloadframeworks_base-009b32dc8b9c32160e02a63b60636854f0ceb86f.zip
frameworks_base-009b32dc8b9c32160e02a63b60636854f0ceb86f.tar.gz
frameworks_base-009b32dc8b9c32160e02a63b60636854f0ceb86f.tar.bz2
Merge change 2109 into donut
* changes: Add option for gtalk stream compression
-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 56a0104..bd45978 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2588,6 +2588,11 @@ public final class Settings {
"gtalk_ssl_handshake_timeout_ms";
/**
+ * Compress the gtalk stream.
+ */
+ public static final String GTALK_COMPRESS = "gtalk_compress";
+
+ /**
* Enable use of ssl session caching.
* 'db' - save each session in a (per process) database
* 'file' - save each session in a (per process) file