diff options
| author | Brian Williammee <bwill@google.com> | 2013-08-07 17:34:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-07 17:34:50 +0000 |
| commit | e2b1b8e2adcc212f8505bf77a5d7e098d7c12c2f (patch) | |
| tree | b2d62ab335807beb92707c0665b26ded9ce34e30 /core/res | |
| parent | d840526196108956c9e62e880b3f749cec11a5ec (diff) | |
| parent | 1ed51627d94b140e8893b8e1dcde9bf37e2adca7 (diff) | |
| download | frameworks_base-e2b1b8e2adcc212f8505bf77a5d7e098d7c12c2f.zip frameworks_base-e2b1b8e2adcc212f8505bf77a5d7e098d7c12c2f.tar.gz frameworks_base-e2b1b8e2adcc212f8505bf77a5d7e098d7c12c2f.tar.bz2 | |
Merge "Track latency of captive portal checks"
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a9a14ad..d106cf2 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -201,6 +201,7 @@ <protected-broadcast android:name="android.net.wifi.p2p.PERSISTENT_GROUPS_CHANGED" /> <protected-broadcast android:name="android.net.conn.TETHER_STATE_CHANGED" /> <protected-broadcast android:name="android.net.conn.INET_CONDITION_ACTION" /> + <protected-broadcast android:name="android.net.conn.NETWORK_CONDITIONS_MEASURED" /> <protected-broadcast android:name="android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE" /> <protected-broadcast android:name="android.intent.action.EXTERNAL_APPLICATIONS_UNAVAILABLE" /> <protected-broadcast android:name="android.intent.action.AIRPLANE_MODE" /> @@ -2399,6 +2400,13 @@ android:description="@string/permdesc_invokeCarrierSetup" android:protectionLevel="signature|system" /> + <!-- Allows an application to listen for network condition observations. + @hide This is not a third-party API (intended for system apps). --> + <permission android:name="android.permission.ACCESS_NETWORK_CONDITIONS" + android:label="@string/permlab_accessNetworkConditions" + android:description="@string/permdesc_accessNetworkConditions" + android:protectionLevel="signature|system" /> + <!-- The system process is explicitly the only one allowed to launch the confirmation UI for full backup/restore --> <uses-permission android:name="android.permission.CONFIRM_FULL_BACKUP"/> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index d3dbb2a..1b5ee68 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1905,6 +1905,11 @@ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_invokeCarrierSetup">Allows the holder to invoke the carrier-provided configuration app. Should never be needed for normal apps.</string> + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permlab_accessNetworkConditions">listen for observations on network conditions</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_accessNetworkConditions">Allows an application to listen for observations on network conditions. Should never be needed for normal apps.</string> + <!-- Policy administration --> <!-- Title of policy access to limiting the user's password choices --> |