Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58e49a50 authored by Xia Wang's avatar Xia Wang Committed by Android (Google) Code Review
Browse files

Merge " ConnectivityManagerTestActivity can be launched from launcher. Help...

Merge " ConnectivityManagerTestActivity can be launched from launcher.  Help to track bug 2680352.  Add a resource file for string.  Corrent some typos." into kraken
parents c5859388 0b90d76e
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -24,17 +24,19 @@
    <application>
        <uses-library android:name="android.test.runner" />
        <activity android:name="ConnectivityManagerTestActivity"
          android:label="CMTest">
          android:label="@string/app_name">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.TEST" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
    </application>
    <!--
    This declares that this app uses the instrumentation test runner targeting
    the package of browserpowertest. To run the tests use the command:
    "adb shell am instrument -w com.android.connectivitymanagertest/.ConnectivityManagerTestRunner"
    the package of connectivitymanagertest. To run the tests use the command:
    "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"
        android:targetPackage="com.android.connectivitymanagertest"
+4 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <string name="app_name">ConnectivityManagerTest</string>
</resources>