summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-26 15:52:48 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-05-26 15:52:48 -0700
commit7f36a5729f17fcb37a7b65a13fd86b0d922caca9 (patch)
treec5b2115154ee602bd2be473962a9e62c2e58ef1e
parent96b1534e01ec0cbb807afc806afee6bb0015b656 (diff)
parent58eef7e4cf004857d1accef9b1bf4fed87ecf76b (diff)
downloadframeworks_base-7f36a5729f17fcb37a7b65a13fd86b0d922caca9.zip
frameworks_base-7f36a5729f17fcb37a7b65a13fd86b0d922caca9.tar.gz
frameworks_base-7f36a5729f17fcb37a7b65a13fd86b0d922caca9.tar.bz2
Merge change 2355
* changes: add Gservices setting for "send message using bareJid timeout".
-rw-r--r--core/java/android/provider/Settings.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index abe3274..b2bdc6d 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2609,6 +2609,16 @@ public final class Settings {
public static final String GTALK_COMPRESS = "gtalk_compress";
/**
+ * This is the timeout for which Google Talk will send the message using bareJID. In a
+ * established chat between two XMPP endpoints, Google Talk uses fullJID in the format
+ * of user@domain/resource in order to send the message to the specific client. However,
+ * if Google Talk hasn't received a message from that client after some time, it would
+ * fall back to use the bareJID, which would broadcast the message to all clients for
+ * the other user.
+ */
+ public static final String GTALK_USE_BARE_JID_TIMEOUT_MS = "gtalk_use_barejid_timeout_ms";
+
+ /**
* Enable use of ssl session caching.
* 'db' - save each session in a (per process) database
* 'file' - save each session in a (per process) file