Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90c8f835 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am d6dd686b: Merge change 4805 into donut 

Merge commit 'd6dd686b'

* commit 'd6dd686b':
  add GServices settings for Google Talk privacy and legal urls.
parents f3e9d06e d6dd686b

core/java/android/provider/Settings.java

+15 −0
Original line number Diff line number Diff line
@@ -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.

         */