commit 97bc736e34fc6afc26b9983458ecbf7f78dca395
author Eric Rowe <erowe@google.com> Fri Nov 21 02:42:18 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 21 02:42:18 2014 +0000
tree aa7ab19968c89cf6a919665671ec7ec640bd0c04
parent 4d6b1549a7eb8d0ae2320557533fcdce7679e7df
parent 37368d7ae493ad39c5ec8bb70afe64fcb0f6c31f

am 37368d7a: am 79de0066: Merge "Fix wifi tethering tests." into lmp-mr1-dev automerge: d2fd1bd

* commit '37368d7ae493ad39c5ec8bb70afe64fcb0f6c31f':
  Fix wifi tethering tests.

core/tests/ConnectivityManagerTest/AndroidManifest.xml

diff --git a/core/tests/ConnectivityManagerTest/AndroidManifest.xml b/core/tests/ConnectivityManagerTest/AndroidManifest.xml
index 1649268..6bd8f6e 100644
--- a/core/tests/ConnectivityManagerTest/AndroidManifest.xml
+++ b/core/tests/ConnectivityManagerTest/AndroidManifest.xml
@@ -68,8 +68,9 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
     <!-- This permission is added for API call setAirplaneMode() in ConnectivityManager -->