diff options
| author | Wink Saville <wink@google.com> | 2013-07-01 16:12:31 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2013-07-01 16:12:31 -0700 |
| commit | 9f6a7f424fad614fdb991bd978009eb1321c70a6 (patch) | |
| tree | cafd980497fda12924f047869d3e57b6cb8425c4 /telephony/java/com | |
| parent | b6812a0cf65b4ddfe250ad1d6f47168dc983b025 (diff) | |
| parent | 3b5d686e683b1811ca90e056065dcf3805bb256a (diff) | |
| download | frameworks_base-9f6a7f424fad614fdb991bd978009eb1321c70a6.zip frameworks_base-9f6a7f424fad614fdb991bd978009eb1321c70a6.tar.gz frameworks_base-9f6a7f424fad614fdb991bd978009eb1321c70a6.tar.bz2 | |
Merge commit '3b5d686e' into fix-merge-conflict
* commit '3b5d686e':
Add checkMobileProvisioning to ConnectivityService.
Conflicts:
services/java/com/android/server/ConnectivityService.java
Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458
Diffstat (limited to 'telephony/java/com')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/DctConstants.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/DctConstants.java b/telephony/java/com/android/internal/telephony/DctConstants.java index 9d556c0..4d8342c 100644 --- a/telephony/java/com/android/internal/telephony/DctConstants.java +++ b/telephony/java/com/android/internal/telephony/DctConstants.java @@ -93,6 +93,7 @@ public class DctConstants { public static final int EVENT_ICC_CHANGED = BASE + 33; public static final int EVENT_DISCONNECT_DC_RETRYING = BASE + 34; public static final int EVENT_DATA_SETUP_COMPLETE_ERROR = BASE + 35; + public static final int CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA = BASE + 36; /***** Constants *****/ |