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

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

Merge change 4550 

* changes:
  add a checkin eventlog tag for reporting GTalk heartbeat timeout; remove unused adaptive heartbeat settings.
parents 530b7125 50c786d1

core/java/android/provider/Settings.java

+0 −20
Original line number Diff line number Diff line
@@ -2622,26 +2622,6 @@ public final class Settings { 
        public static final String GTALK_SERVICE_WIFI_MAX_HEARTBEAT_INTERVAL_MS =

                "gtalk_wifi_max_heartbeat_ping_interval_ms";



        /**

         * The minimum interval for how frequently we send heartbeat pings to the GTalk server.

         */

        public static final String GTALK_SERVICE_MIN_HEARTBEAT_INTERVAL_MS =

                "gtalk_min_heartbeat_ping_interval_ms";



        /**

         * The scale down factor used by adaptive heartbeat logic (to scale down the heartbeat

         * interval) when the previous interval fails to get a response from the server.

         */

        public static final String GTALK_SERVICE_ADAPTIVE_HEARTBEAT_SCALER =

                "gtalk_adaptive_heartbeat_scaler";



        /**

         * The trigger for adaptively scaling down the heartbeat interval. This is the number of

         * consecutive times we failed to get a server response for sending the heartbeat ping.

         */

        public static final String GTALK_SERVICE_ADAPTIVE_HEARTBEAT_TRIGGER =

                "gtalk_adaptive_heartbeat_trigger";



        /**

         * How long we wait to receive a heartbeat ping acknowledgement (or another packet)

         * from the GTalk server, before deeming the connection dead.