summaryrefslogtreecommitdiffstats
path: root/core/res/AndroidManifest.xml
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2015-02-27 22:55:47 -0500
committerPaul Jensen <pauljensen@google.com>2015-04-16 16:53:10 +0000
commit25a217c0fbda9bbaf58ec08b91115e99f73b727f (patch)
treeac4d41cd935606dac1fa1a7bb47ee776958143c4 /core/res/AndroidManifest.xml
parent04b18ec15359b79b832ec50010f050d7298e7fb5 (diff)
downloadframeworks_base-25a217c0fbda9bbaf58ec08b91115e99f73b727f.zip
frameworks_base-25a217c0fbda9bbaf58ec08b91115e99f73b727f.tar.gz
frameworks_base-25a217c0fbda9bbaf58ec08b91115e99f73b727f.tar.bz2
Add captive portal API.
This API allows apps other than the system's CaptivePortalLogin to handle signing in to captive portals. bug:19416463 Change-Id: I27fce5856b635233e6ff66396d50ccabedd76cf5
Diffstat (limited to 'core/res/AndroidManifest.xml')
-rw-r--r--core/res/AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index b1213b3..ed21e80 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -208,6 +208,7 @@
<protected-broadcast android:name="android.intent.action.MEDIA_UNMOUNTABLE" />
<protected-broadcast android:name="android.intent.action.MEDIA_EJECT" />
+ <protected-broadcast android:name="android.net.conn.CAPTIVE_PORTAL" />
<protected-broadcast android:name="android.net.conn.CONNECTIVITY_CHANGE" />
<protected-broadcast android:name="android.net.conn.CONNECTIVITY_CHANGE_IMMEDIATE" />
<protected-broadcast android:name="android.net.conn.DATA_ACTIVITY_CHANGE" />