summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2013-09-04 18:14:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-04 18:14:07 -0700
commit323af8b49df3535977b5aa7f5b31c429d8a50f10 (patch)
tree0605b3a1a6397eb13e2f3446c0bedca471ba6196
parentf56076eefba47dad9b66b3011f487dc9a22e2756 (diff)
parentaa5b0f8bdadcfa1ddb041e09b815ea4b5986e901 (diff)
downloadframeworks_base-323af8b49df3535977b5aa7f5b31c429d8a50f10.zip
frameworks_base-323af8b49df3535977b5aa7f5b31c429d8a50f10.tar.gz
frameworks_base-323af8b49df3535977b5aa7f5b31c429d8a50f10.tar.bz2
am aa5b0f8b: am ce1e3798: Add provisioning apn timeout.
* commit 'aa5b0f8bdadcfa1ddb041e09b815ea4b5986e901': Add provisioning apn timeout.
-rw-r--r--core/java/android/provider/Settings.java7
-rw-r--r--telephony/java/com/android/internal/telephony/DctConstants.java1
2 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 81e76ab..5e1f27e 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -4937,6 +4937,13 @@ public final class Settings {
"data_stall_alarm_aggressive_delay_in_ms";
/**
+ * The number of milliseconds to allow the provisioning apn to remain active
+ * @hide
+ */
+ public static final String PROVISIONING_APN_ALARM_DELAY_IN_MS =
+ "provisioning_apn_alarm_delay_in_ms";
+
+ /**
* The interval in milliseconds at which to check gprs registration
* after the first registration mismatch of gprs and voice service,
* to detect possible data network registration problems.
diff --git a/telephony/java/com/android/internal/telephony/DctConstants.java b/telephony/java/com/android/internal/telephony/DctConstants.java
index eb93e9c..e50cb95 100644
--- a/telephony/java/com/android/internal/telephony/DctConstants.java
+++ b/telephony/java/com/android/internal/telephony/DctConstants.java
@@ -96,6 +96,7 @@ public class DctConstants {
public static final int CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA = BASE + 36;
public static final int CMD_ENABLE_MOBILE_PROVISIONING = BASE + 37;
public static final int CMD_IS_PROVISIONING_APN = BASE + 38;
+ public static final int EVENT_PROVISIONING_APN_ALARM = BASE + 39;
/***** Constants *****/