commit dd6fb0a4193b129e75348c3e8b2aa1a191a7f7fb
author The Android Automerger <android-build@android.com> Tue Jul 24 20:23:08 2012 -0700
committer The Android Automerger <android-build@android.com> Tue Jul 24 20:23:08 2012 -0700
tree 2a29ad542a5a570207e99511996f6da70c47e068
parent a4170d951a07c6d6f57bcb37a0de9e9d76ecf130
parent 30199405c3b15a0dc6778e7465499a7d33f7556c

merge in jb-release history after reset to jb-dev

tests/cts/net/Android.mk

diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk
index b327392..5c70ad4 100644
--- a/tests/cts/net/Android.mk
+++ b/tests/cts/net/Android.mk
@@ -28,7 +28,7 @@
 
 LOCAL_PACKAGE_NAME := CtsNetTestCases
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestserver ctsutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestserver ctsutil
 
 # uncomment when dalvik.annotation.Test* are removed or part of SDK
 #LOCAL_SDK_VERSION := current

tests/cts/net/AndroidManifest.xml

diff --git a/tests/cts/net/AndroidManifest.xml b/tests/cts/net/AndroidManifest.xml
index ade6728..b3556f5 100644
--- a/tests/cts/net/AndroidManifest.xml
+++ b/tests/cts/net/AndroidManifest.xml
@@ -22,7 +22,6 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -32,7 +31,7 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
-    <instrumentation android:name="android.test.InstrumentationCtsTestRunner"
+    <instrumentation android:name="android.test.InstrumentationTestRunner"
                      android:targetPackage="com.android.cts.net"
                      android:label="CTS tests of android.net"/>