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

Commit 98187192 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 24014 into eclair

* changes:
  Gservices settings for controlling URL scraping in GTalk app.
parents ffae4fcc 7a0c108d
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -3031,6 +3031,12 @@ public final class Settings {
        public static final String PUSH_MESSAGING_REGISTRATION_URL =
                "push_messaging_registration_url";

        /**
         * Enable/disable GTalk URL scraping for JPG images.
         */
        public static final String GTALK_URL_SCRAPING_FOR_JPG =
                "gtalk_url_scraping_for_jpg";

        /**
         * Use android://<it> routing infos for Google Sync Server subcriptions.
         */