summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorRobert Greenwalt <robdroid@android.com>2011-11-08 10:01:30 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-08 10:01:30 -0800
commit322da5917467f9b7b100c35f7c24bee5c9bc3909 (patch)
tree56d3753a99396fa6f26e5204526fdd4b6abe56c5 /AndroidManifest.xml
parentab300c9d2397bc8805a9dc4fbbfa07db7417fb09 (diff)
parent7c5c16565eccde0b98f7ad08a0f06ff51e8e90ce (diff)
downloadpackages_apps_settings-322da5917467f9b7b100c35f7c24bee5c9bc3909.zip
packages_apps_settings-322da5917467f9b7b100c35f7c24bee5c9bc3909.tar.gz
packages_apps_settings-322da5917467f9b7b100c35f7c24bee5c9bc3909.tar.bz2
Merge "Wimax : 4G settings menu and 4G MAC address." into ics-mr1
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cf87d35..649e06c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,6 +25,8 @@
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_WIMAX_STATE" />
+ <uses-permission android:name="android.permission.CHANGE_WIMAX_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.INTERNET" />