diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-26 18:02:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-26 18:02:08 -0700 |
| commit | eba9fe3f8e3c6cf448183678a1b2a9987ce4ac71 (patch) | |
| tree | fc80c6f243c8646e62392edb683fa8715e47590a /core | |
| parent | c29df57e5abb09c7e1ceed153e8f2b906f522d7b (diff) | |
| parent | a85d46aff547a1007beb32b01d1dfab68a2115b4 (diff) | |
| download | frameworks_base-eba9fe3f8e3c6cf448183678a1b2a9987ce4ac71.zip frameworks_base-eba9fe3f8e3c6cf448183678a1b2a9987ce4ac71.tar.gz frameworks_base-eba9fe3f8e3c6cf448183678a1b2a9987ce4ac71.tar.bz2 | |
Merge change 2492 into donut
* changes:
add Gservices setting for "send message using bareJid timeout".
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Settings.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index bd45978..559f224 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2593,6 +2593,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 |