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

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

Browse Source 
Change-Id: I2fe990c0b1559b478669784a354208c4a75cf111
This commit is contained in:
Automerger Merge Worker
2020-03-03 03:04:00 +00:00
parent 10531c2fb5 580f82768c
commit 649bf1a694
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -46858,7 +46858,7 @@ package android.telephony {
public static final class CarrierConfigManager.Ims { public static final class CarrierConfigManager.Ims {
field public static final String KEY_PREFIX = "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 { public abstract class CellIdentity implements android.os.Parcelable {

6
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -3519,14 +3519,14 @@ public class CarrierConfigManager {
/** /**
* Delay in milliseconds to turn off wifi when IMS is registered over wifi. * Delay in milliseconds to turn off wifi when IMS is registered over wifi.
*/ */
public static final String KEY_WIFI_OFF_DEFERRING_TIME_INT = public static final String KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT =
KEY_PREFIX + "wifi_off_deferring_time_int"; KEY_PREFIX + "wifi_off_deferring_time_millis_int";
private Ims() {} private Ims() {}
private static PersistableBundle getDefaults() { private static PersistableBundle getDefaults() {
PersistableBundle defaults = new PersistableBundle(); 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; return defaults;
} }
} }