diff options
author | Jeff Sharkey <jsharkey@android.com> | 2012-08-06 13:44:53 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-06 13:44:53 -0700 |
commit | 3d403aacd47486e76f07bb4b6223af05a5fc8708 (patch) | |
tree | fe4ea7ea3fb415f3f120056a991733d172cc5e87 /api | |
parent | dc49ca03443d37859d2d284a2c03bbc097de55af (diff) | |
parent | a51e444ed44baa39564d066e78a0650bfd57ccea (diff) | |
download | frameworks_base-3d403aacd47486e76f07bb4b6223af05a5fc8708.zip frameworks_base-3d403aacd47486e76f07bb4b6223af05a5fc8708.tar.gz frameworks_base-3d403aacd47486e76f07bb4b6223af05a5fc8708.tar.bz2 |
am a51e444e: am 4e4306ab: Merge "Include network type that caused broadcast." into jb-mr1-dev
* commit 'a51e444ed44baa39564d066e78a0650bfd57ccea':
Include network type that caused broadcast.
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 4be5043..8808b47 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12402,6 +12402,7 @@ package android.net { field public static final java.lang.String EXTRA_EXTRA_INFO = "extraInfo"; field public static final java.lang.String EXTRA_IS_FAILOVER = "isFailover"; field public static final deprecated java.lang.String EXTRA_NETWORK_INFO = "networkInfo"; + field public static final java.lang.String EXTRA_NETWORK_TYPE = "networkType"; field public static final java.lang.String EXTRA_NO_CONNECTIVITY = "noConnectivity"; field public static final java.lang.String EXTRA_OTHER_NETWORK_INFO = "otherNetwork"; field public static final java.lang.String EXTRA_REASON = "reason"; |