LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "CTS: Only listen to wifi events when toggling wifi" into nyc-dev

Browse Source
This commit is contained in:
Phil Weaver
2016-06-23 01:48:10 +00:00
committed by Android (Google) Code Review
parent 86ba00d2a9 0d7d1da503
commit 79fad1a209
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cts/net/appForApi23/AndroidManifest.xml
View File

@@ -28,7 +28,7 @@
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" /> <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.net.cts.appForApi23.getConnectivityActionCount" /> <action android:name="android.net.cts.appForApi23.getWifiConnectivityActionCount" />
</intent-filter> </intent-filter>
</receiver> </receiver>

15
tests/cts/net/appForApi23/src/android/net/cts/appForApi23/ConnectivityReceiver.java
View File

@@ -21,18 +21,21 @@ import android.content.Intent;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
public class ConnectivityReceiver extends BroadcastReceiver { public class ConnectivityReceiver extends BroadcastReceiver {
public static String GET_CONNECTIVITY_ACTION_COUNT = public static String GET_WIFI_CONNECTIVITY_ACTION_COUNT =
"android.net.cts.appForApi23.getConnectivityActionCount"; "android.net.cts.appForApi23.getWifiConnectivityActionCount";
private static int sConnectivityActionCount = 0; private static int sWifiConnectivityActionCount = 0;
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (ConnectivityManager.CONNECTIVITY_ACTION.equals(intent.getAction())) { if (ConnectivityManager.CONNECTIVITY_ACTION.equals(intent.getAction())) {
sConnectivityActionCount++; int networkType = intent.getIntExtra(ConnectivityManager.EXTRA_NETWORK_TYPE, 0);
if (networkType == ConnectivityManager.TYPE_WIFI) {
sWifiConnectivityActionCount++;
}
} }
if (GET_CONNECTIVITY_ACTION_COUNT.equals(intent.getAction())) { if (GET_WIFI_CONNECTIVITY_ACTION_COUNT.equals(intent.getAction())) {
setResultCode(sConnectivityActionCount); setResultCode(sWifiConnectivityActionCount);
} }
} }
} }

8
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -77,9 +77,9 @@ public class ConnectivityManagerTest extends AndroidTestCase {
private static final String NETWORK_CALLBACK_ACTION = private static final String NETWORK_CALLBACK_ACTION =
"ConnectivityManagerTest.NetworkCallbackAction"; "ConnectivityManagerTest.NetworkCallbackAction";
// Intent string to get the number of CONNECTIVITY_ACTION callbacks the test app has seen // Intent string to get the number of wifi CONNECTIVITY_ACTION callbacks the test app has seen
public static final String GET_CONNECTIVITY_ACTION_COUNT = public static final String GET_WIFI_CONNECTIVITY_ACTION_COUNT =
"android.net.cts.appForApi23.getConnectivityActionCount"; "android.net.cts.appForApi23.getWifiConnectivityActionCount";
// device could have only one interface: data, wifi. // device could have only one interface: data, wifi.
private static final int MIN_NUM_NETWORK_TYPES = 1; private static final int MIN_NUM_NETWORK_TYPES = 1;
@@ -423,7 +423,7 @@ public class ConnectivityManagerTest extends AndroidTestCase {
toggleWifi(); toggleWifi();
Intent getConnectivityCount = new Intent(GET_CONNECTIVITY_ACTION_COUNT); Intent getConnectivityCount = new Intent(GET_WIFI_CONNECTIVITY_ACTION_COUNT);
assertEquals(2, sendOrderedBroadcastAndReturnResultCode( assertEquals(2, sendOrderedBroadcastAndReturnResultCode(
getConnectivityCount, SEND_BROADCAST_TIMEOUT)); getConnectivityCount, SEND_BROADCAST_TIMEOUT));
} }