Merge " ConnectivityManagerTestActivity can be launched from launcher. Help to track bug 2680352. Add a resource file for string. Corrent some typos." into kraken
This commit is contained in:
@ -24,17 +24,19 @@
|
|||||||
<application>
|
<application>
|
||||||
<uses-library android:name="android.test.runner" />
|
<uses-library android:name="android.test.runner" />
|
||||||
<activity android:name="ConnectivityManagerTestActivity"
|
<activity android:name="ConnectivityManagerTestActivity"
|
||||||
android:label="CMTest">
|
android:label="@string/app_name">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
<category android:name="android.intent.category.TEST" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
</application>
|
</application>
|
||||||
<!--
|
<!--
|
||||||
This declares that this app uses the instrumentation test runner targeting
|
This declares that this app uses the instrumentation test runner targeting
|
||||||
the package of browserpowertest. To run the tests use the command:
|
the package of connectivitymanagertest. To run the tests use the command:
|
||||||
"adb shell am instrument -w com.android.connectivitymanagertest/.ConnectivityManagerTestRunner"
|
"adb shell am instrument -e ssid <SSID> -w
|
||||||
|
com.android.connectivitymanagertest/.ConnectivityManagerTestRunner",
|
||||||
|
the access point <SSID> should be an open AP.
|
||||||
-->
|
-->
|
||||||
<instrumentation android:name=".ConnectivityManagerTestRunner"
|
<instrumentation android:name=".ConnectivityManagerTestRunner"
|
||||||
android:targetPackage="com.android.connectivitymanagertest"
|
android:targetPackage="com.android.connectivitymanagertest"
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<string name="app_name">ConnectivityManagerTest</string>
|
||||||
|
</resources>
|
Reference in New Issue
Block a user