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

Merge "Cellular data stall recovery based on networkStatus" am: 44631dfc26

Browse Source 
am: e9dc415e2b

Change-Id: I2e381e9215a2d8f036a0de4f021573688250c142
This commit is contained in:
Jayachandran Chinnakkannu
2019-01-18 15:43:03 -08:00
committed by android-build-merger
parent 35ddfca938 e9dc415e2b
commit 58a61cc734
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/provider/Settings.java
View File

@@ -10474,6 +10474,21 @@ public final class Settings {
*/
public static final String DATA_STALL_EVALUATION_TYPE = "data_stall_evaluation_type";
/**
* Whether to try cellular data recovery when a bad network is reported.
*
* @hide
*/
public static final String DATA_STALL_RECOVERY_ON_BAD_NETWORK =
"data_stall_recovery_on_bad_network";
/**
* Minumim duration in millisecodns between cellular data recovery attempts
*
* @hide
*/
public static final String MIN_DURATION_BETWEEN_RECOVERY_STEPS_IN_MS =
"min_duration_between_recovery_steps";
/**
* Whether network service discovery is enabled.
*

2
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -188,6 +188,7 @@ public class SettingsBackupTest {
Settings.Global.DATA_STALL_CONSECUTIVE_DNS_TIMEOUT_THRESHOLD,
Settings.Global.DATA_STALL_EVALUATION_TYPE,
Settings.Global.DATA_STALL_MIN_EVALUATE_INTERVAL,
Settings.Global.DATA_STALL_RECOVERY_ON_BAD_NETWORK,
Settings.Global.DATA_STALL_VALID_DNS_TIME_THRESHOLD,
Settings.Global.DEBUG_APP,
Settings.Global.DEBUG_VIEW_ATTRIBUTES,
@@ -291,6 +292,7 @@ public class SettingsBackupTest {
Settings.Global.MDC_INITIAL_MAX_RETRY,
Settings.Global.MHL_INPUT_SWITCHING_ENABLED,
Settings.Global.MHL_POWER_CHARGE_ENABLED,
Settings.Global.MIN_DURATION_BETWEEN_RECOVERY_STEPS_IN_MS,
Settings.Global.MOBILE_DATA, // Candidate for backup?
Settings.Global.MOBILE_DATA_ALWAYS_ON,
Settings.Global.MODE_RINGER,

2
telephony/java/com/android/internal/telephony/DctConstants.java
View File

@@ -87,7 +87,7 @@ public class DctConstants {
public static final int CMD_NET_STAT_POLL = BASE + 40;
public static final int EVENT_DATA_RAT_CHANGED = BASE + 41;
public static final int CMD_CLEAR_PROVISIONING_SPINNER = BASE + 42;
public static final int EVENT_REDIRECTION_DETECTED = BASE + 44;
public static final int EVENT_NETWORK_STATUS_CHANGED = BASE + 44;
public static final int EVENT_PCO_DATA_RECEIVED = BASE + 45;
public static final int EVENT_DATA_ENABLED_CHANGED = BASE + 46;
public static final int EVENT_DATA_RECONNECT = BASE + 47;