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

Commit 7ec42d50 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Wifi: revise WIFI off deferring constant name" into rvc-dev am: 580f8276 

Change-Id: I8ba9fd6e3c07708940e73f31c77371aa11a7312d
parents 98c16464 580f8276

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -46858,7 +46858,7 @@ package android.telephony { 














  public static final class CarrierConfigManager.Ims {















    field public static final String KEY_PREFIX = "ims.";













    field public static final String KEY_WIFI_OFF_DEFERRING_TIME_INT = "ims.wifi_off_deferring_time_int";













    field public static final String KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT = "ims.wifi_off_deferring_time_millis_int";















  }





























  public abstract class CellIdentity implements android.os.Parcelable {

























telephony/java/android/telephony/CarrierConfigManager.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -3484,14 +3484,14 @@ public class CarrierConfigManager {













        /**















         * Delay in milliseconds to turn off wifi when IMS is registered over wifi.















         */













        public static final String KEY_WIFI_OFF_DEFERRING_TIME_INT =













                KEY_PREFIX + "wifi_off_deferring_time_int";













        public static final String KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT =













                KEY_PREFIX + "wifi_off_deferring_time_millis_int";































        private Ims() {}































        private static PersistableBundle getDefaults() {















            PersistableBundle defaults = new PersistableBundle();













            defaults.putInt(KEY_WIFI_OFF_DEFERRING_TIME_INT, 0);













            defaults.putInt(KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT, 0);















            return defaults;















        }















    }