diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-04-15 11:48:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-15 11:48:22 +0000 |
| commit | e9a88a3844d8ea7429aa3a5762a1f345b25ce102 (patch) | |
| tree | f1705b090e8e1b92b4e70152f6b1fc0b4f064ad1 /packages/SystemUI | |
| parent | fdddb4eb69e719563e604f7dd27ac6999c7844da (diff) | |
| parent | 1248dd3c296a94457d5864b7f433335f32490b50 (diff) | |
| download | frameworks_base-e9a88a3844d8ea7429aa3a5762a1f345b25ce102.zip frameworks_base-e9a88a3844d8ea7429aa3a5762a1f345b25ce102.tar.gz frameworks_base-e9a88a3844d8ea7429aa3a5762a1f345b25ce102.tar.bz2 | |
Merge changes from topic 'no_internet'
* changes:
Add a noInternetAccessExpected boolean to WifiConfiguration.
Prompt if a network without an Internet connection is selected
Give SystemUI the OVERRIDE_WIFI_CONFIG permission.
Add an UNKNOWN_UID constant to WifiConfiguration.
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 012c84c..a8a4baa 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -53,6 +53,7 @@ <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> + <uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" /> <uses-permission android:name="android.permission.MANAGE_NETWORK_POLICY" /> <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" /> <uses-permission android:name="android.permission.READ_NETWORK_USAGE_HISTORY" /> |