Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4d5b4225: Merge change 22795 into eclair

Browse Source 
Merge commit '4d5b4225e492f3de543efa195204f38d03a6721a' into eclair-plus-aosp

* commit '4d5b4225e492f3de543efa195204f38d03a6721a':
  The Gservices settings for pruning messages/chats.
This commit is contained in:
Ye Wen
2009-08-27 11:00:09 -07:00
committed by Android Git Automerger
parent db978b1f8d 4d5b4225e4
commit 0b05e730fe
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/java/android/provider/Settings.java
View File

@@ -2967,16 +2967,34 @@ public final class Settings {
public static final String GTALK_YOUTUBE_VIDEO_URL = public static final String GTALK_YOUTUBE_VIDEO_URL =
"gtalk_youtube_video_url"; "gtalk_youtube_video_url";
/**
* Chat message lifetime (for pruning old chat messages).
*/
public static final String GTALK_CHAT_MESSAGE_LIFETIME =
"gtalk_chat_message_lifetime";
/**
* OTR message lifetime (for pruning old otr messages).
*/
public static final String GTALK_OTR_MESSAGE_LIFETIME =
"gtalk_otr_message_lifetime";
/**
* Chat expiration time, i.e., time since last message in the chat (for pruning old chats).
*/
public static final String GTALK_CHAT_EXPIRATION_TIME =
"gtalk_chat_expiration_time";
/** /**
* This is the url for getting the app token for server-to-device push messaging. * This is the url for getting the app token for server-to-device push messaging.
*/ */
public static final String PUSH_MESSAGING_REGISTRATION_URL = public static final String PUSH_MESSAGING_REGISTRATION_URL =
"push_messaging_registration_url"; "push_messaging_registration_url";
/** /**
* Use android://<it> routing infos for Google Sync Server subcriptions. * Use android://<it> routing infos for Google Sync Server subcriptions.
*/ */
public static final String GSYNC_USE_RMQ2_ROUTING_INFO = "gsync_use_rmq2_routing_info"; public static final String GSYNC_USE_RMQ2_ROUTING_INFO = "gsync_use_rmq2_routing_info";
/** /**
* Enable use of ssl session caching. * Enable use of ssl session caching.