diff options
| author | Wink Saville <wink@google.com> | 2013-08-29 14:57:08 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2013-08-29 14:57:08 -0700 |
| commit | 7788c61af5927a0fac612ea94d5205eeec2f507f (patch) | |
| tree | f2e7664071b52151a9ebf043d08448f36f4698cc /telephony/java | |
| parent | 4b2993123bf9a1c56d0a16b032612834dd418520 (diff) | |
| parent | 270226b0dddcf3ccb9a4c13cd3dd0427ebc7a4aa (diff) | |
| download | frameworks_base-7788c61af5927a0fac612ea94d5205eeec2f507f.zip frameworks_base-7788c61af5927a0fac612ea94d5205eeec2f507f.tar.gz frameworks_base-7788c61af5927a0fac612ea94d5205eeec2f507f.tar.bz2 | |
Merge commit '270226b0' into manualmerge
* commit '270226b0':
Add support for handling mobile provisioning networks.
Conflicts:
core/java/android/net/CaptivePortalTracker.java
core/java/android/net/ConnectivityManager.java
core/java/android/net/IConnectivityManager.aidl
core/java/android/net/MobileDataStateTracker.java
core/res/AndroidManifest.xml
services/java/com/android/server/ConnectivityService.java
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/DctConstants.java | 3 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/TelephonyIntents.java | 23 |
2 files changed, 26 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/DctConstants.java b/telephony/java/com/android/internal/telephony/DctConstants.java index 4f1ae11..c661b00 100644 --- a/telephony/java/com/android/internal/telephony/DctConstants.java +++ b/telephony/java/com/android/internal/telephony/DctConstants.java @@ -94,6 +94,8 @@ public class DctConstants { 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; + public static final int CMD_ENABLE_MOBILE_PROVISIONING = BASE + 37; + public static final int CMD_IS_PROVISIONING_APN = BASE + 38; /***** Constants *****/ @@ -113,4 +115,5 @@ public class DctConstants { public static final int ENABLED = 1; public static final String APN_TYPE_KEY = "apnType"; + public static final String PROVISIONING_URL_KEY = "provisioningUrl"; } diff --git a/telephony/java/com/android/internal/telephony/TelephonyIntents.java b/telephony/java/com/android/internal/telephony/TelephonyIntents.java index 65bdacf..a7baf1c 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyIntents.java +++ b/telephony/java/com/android/internal/telephony/TelephonyIntents.java @@ -145,6 +145,29 @@ public class TelephonyIntents { public static final String ACTION_ANY_DATA_CONNECTION_STATE_CHANGED = "android.intent.action.ANY_DATA_STATE"; + /** + * Broadcast Action: Occurs when a data connection connects to a provisioning apn + * and is broadcast by the low level data connection code. + * The intent will have the following extra values:</p> + * <ul> + * <li><em>apn</em> - A string that is the APN associated with this + * connection.</li> + * <li><em>apnType</em> - A string array of APN types associated with + * this connection. The APN type <code>"*"</code> is a special + * type that means this APN services all types.</li> + * <li><em>linkProperties</em> - The <code>LinkProperties</code> for this APN</li> + * <li><em>linkCapabilities</em> - The <code>linkCapabilities</code> for this APN</li> + * <li><em>iface</em> - A string that is the name of the interface</li> + * </ul> + * + * <p class="note"> + * Requires the READ_PHONE_STATE permission. + * + * <p class="note">This is a protected intent that can only be sent + * by the system. + */ + public static final String ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN + = "android.intent.action.DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN"; /** * Broadcast Action: An attempt to establish a data connection has failed. |