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

CONNECTIVITY_ACTION is the new _IMMEDIATE

Browse Source 
Bug: 20013379
Change-Id: I3e904dc0a0ddb30c7bb8cdb24d0762052ddc59eb
This commit is contained in:
Erik Kline
2015-04-20 16:03:48 +09:00
parent 87a81fd19f
commit d06906840a
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
View File

@@ -16,7 +16,7 @@
package com.android.server; package com.android.server;
import static android.net.ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE; import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
import static android.net.ConnectivityManager.TYPE_MOBILE; import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.ConnectivityManager.TYPE_WIFI; import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.net.ConnectivityManager.getNetworkTypeName; import static android.net.ConnectivityManager.getNetworkTypeName;
@@ -157,7 +157,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
// mMobile.link.addRoute(MOBILE_ROUTE_V6); // mMobile.link.addRoute(MOBILE_ROUTE_V6);
// mMobile.doReturnDefaults(); // mMobile.doReturnDefaults();
// //
// nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION_IMMEDIATE); // nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION);
// mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget(); // mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget();
// nextConnBroadcast.get(); // nextConnBroadcast.get();
// //
@@ -177,7 +177,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
// mMobile.link.addRoute(MOBILE_ROUTE_V6); // mMobile.link.addRoute(MOBILE_ROUTE_V6);
// mMobile.doReturnDefaults(); // mMobile.doReturnDefaults();
// //
// nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION_IMMEDIATE); // nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION);
// mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget(); // mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget();
// nextConnBroadcast.get(); // nextConnBroadcast.get();
// //
@@ -193,7 +193,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
// // expect that mobile will be torn down // // expect that mobile will be torn down
// doReturn(true).when(mMobile.tracker).teardown(); // doReturn(true).when(mMobile.tracker).teardown();
// //
// nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION_IMMEDIATE); // nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION);
// mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mWifi.info).sendToTarget(); // mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mWifi.info).sendToTarget();
// nextConnBroadcast.get(); // nextConnBroadcast.get();
// //
@@ -212,7 +212,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
// mMobile.link.clear(); // mMobile.link.clear();
// mMobile.doReturnDefaults(); // mMobile.doReturnDefaults();
// //
// nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION_IMMEDIATE); // nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION);
// mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget(); // mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget();
// nextConnBroadcast.get(); // nextConnBroadcast.get();
// //

26
services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java
View File

@@ -18,7 +18,7 @@ package com.android.server;
import static android.content.Intent.ACTION_UID_REMOVED; import static android.content.Intent.ACTION_UID_REMOVED;
import static android.content.Intent.EXTRA_UID; import static android.content.Intent.EXTRA_UID;
import static android.net.ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE; import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
import static android.net.ConnectivityManager.TYPE_MOBILE; import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.ConnectivityManager.TYPE_WIFI; import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.net.ConnectivityManager.TYPE_WIMAX; import static android.net.ConnectivityManager.TYPE_WIMAX;
@@ -192,7 +192,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
expectNetworkStatsPoll(); expectNetworkStatsPoll();
replay(); replay();
mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE)); mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
// verify service has empty history for wifi // verify service has empty history for wifi
assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0); assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);
@@ -246,7 +246,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
expectNetworkStatsPoll(); expectNetworkStatsPoll();
replay(); replay();
mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE)); mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
// verify service has empty history for wifi // verify service has empty history for wifi
assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0); assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);
@@ -337,7 +337,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
expectNetworkStatsPoll(); expectNetworkStatsPoll();
replay(); replay();
mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE)); mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
verifyAndReset(); verifyAndReset();
// modify some number on wifi, and trigger poll event // modify some number on wifi, and trigger poll event
@@ -389,7 +389,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
expectNetworkStatsPoll(); expectNetworkStatsPoll();
replay(); replay();
mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE)); mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
verifyAndReset(); verifyAndReset();
// create some traffic on first network // create some traffic on first network
@@ -431,7 +431,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
expectNetworkStatsPoll(); expectNetworkStatsPoll();
replay(); replay();
mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE)); mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
mServiceContext.sendBroadcast(new Intent(ACTION_NETWORK_STATS_POLL)); mServiceContext.sendBroadcast(new Intent(ACTION_NETWORK_STATS_POLL));
verifyAndReset(); verifyAndReset();
@@ -477,7 +477,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
expectNetworkStatsPoll(); expectNetworkStatsPoll();
replay(); replay();
mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE)); mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
verifyAndReset(); verifyAndReset();
// create some traffic // create some traffic
@@ -546,7 +546,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
expectNetworkStatsPoll(); expectNetworkStatsPoll();
replay(); replay();
mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE)); mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
verifyAndReset(); verifyAndReset();
// create some traffic // create some traffic
@@ -580,7 +580,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
expectNetworkStatsPoll(); expectNetworkStatsPoll();
replay(); replay();
mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE)); mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
mServiceContext.sendBroadcast(new Intent(ACTION_NETWORK_STATS_POLL)); mServiceContext.sendBroadcast(new Intent(ACTION_NETWORK_STATS_POLL));
verifyAndReset(); verifyAndReset();
@@ -617,7 +617,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
expectNetworkStatsPoll(); expectNetworkStatsPoll();
replay(); replay();
mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE)); mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
verifyAndReset(); verifyAndReset();
// create some traffic for two apps // create some traffic for two apps
@@ -683,7 +683,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
expectNetworkStatsPoll(); expectNetworkStatsPoll();
replay(); replay();
mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE)); mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
verifyAndReset(); verifyAndReset();
// create some initial traffic // create some initial traffic
@@ -748,7 +748,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
expectNetworkStatsPoll(); expectNetworkStatsPoll();
replay(); replay();
mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE)); mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
verifyAndReset(); verifyAndReset();
// create some tethering traffic // create some tethering traffic
@@ -788,7 +788,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
expectNetworkStatsPoll(); expectNetworkStatsPoll();
replay(); replay();
mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE)); mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
verifyAndReset(); verifyAndReset();
// create some traffic, but only for DEV, and across 1.5 buckets // create some traffic, but only for DEV, and across 1.5 buckets