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

am d6dd686b: Merge change 4805 into donut

Browse Source 
Merge commit 'd6dd686bc7adba448af1bc36a022cddba9f9561f'

* commit 'd6dd686bc7adba448af1bc36a022cddba9f9561f':
  add GServices settings for Google Talk privacy and legal urls.
This commit is contained in:
Android (Google) Code Review
2009-06-22 10:45:28 -07:00
committed by The Android Open Source Project
parent f3e9d06e67 d6dd686bc7
commit 90c8f83538
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2544,6 +2544,21 @@ public final class Settings {
*/
public static final String GMAIL_DISCARD_ERROR_UPHILL_OP = "gmail_discard_error_uphill_op";
/**
* the transcoder URL for mobile devices.
*/
public static final String TRANSCODER_URL = "mobile_transcoder_url";
/**
* URL that points to the privacy terms of the Google Talk service.
*/
public static final String GTALK_PRIVACY_URL = "gtalk_privacy_url";
/**
* URL that points to the legal terms of the Google Talk service.
*/
public static final String GTALK_LEGAL_URL = "gtalk_legal_url";
/**
* Hostname of the GTalk server.
*/