CONNECTIVITY_ACTION is the new _IMMEDIATE (f851d6dd) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/location/GpsLocationProvider.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -436,7 +436,7 @@ public class GpsLocationProvider implements LocationProviderInterface {
		checkSmsSuplInit(intent);
		} else if (action.equals(Intents.WAP_PUSH_RECEIVED_ACTION)) {
		checkWapSuplInit(intent);
		} else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE)) {
		} else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
		// retrieve NetworkInfo result for this UID
		NetworkInfo info =
		intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO);

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ import static android.content.Intent.ACTION_UID_REMOVED;
		import static android.content.Intent.ACTION_USER_ADDED;
		import static android.content.Intent.ACTION_USER_REMOVED;
		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_WIMAX;
		import static android.net.ConnectivityManager.isNetworkTypeMobile;
		@@ -407,7 +407,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		mContext.registerReceiver(mScreenReceiver, screenFilter);

		// watch for network interfaces to be claimed
		final IntentFilter connFilter = new IntentFilter(CONNECTIVITY_ACTION_IMMEDIATE);
		final IntentFilter connFilter = new IntentFilter(CONNECTIVITY_ACTION);
		mContext.registerReceiver(mConnReceiver, connFilter, CONNECTIVITY_INTERNAL, mHandler);

		// listen for package changes to update policy

services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		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_WIFI;
		import static android.net.ConnectivityManager.getNetworkTypeName;
		@@ -157,7 +157,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
		// mMobile.link.addRoute(MOBILE_ROUTE_V6);
		// mMobile.doReturnDefaults();
		//
		// nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION_IMMEDIATE);
		// nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION);
		// mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget();
		// nextConnBroadcast.get();
		//
		@@ -177,7 +177,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
		// mMobile.link.addRoute(MOBILE_ROUTE_V6);
		// mMobile.doReturnDefaults();
		//
		// nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION_IMMEDIATE);
		// nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION);
		// mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget();
		// nextConnBroadcast.get();
		//
		@@ -193,7 +193,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
		// // expect that mobile will be torn down
		// 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();
		// nextConnBroadcast.get();
		//
		@@ -212,7 +212,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
		// mMobile.link.clear();
		// mMobile.doReturnDefaults();
		//
		// nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION_IMMEDIATE);
		// nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION);
		// mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget();
		// nextConnBroadcast.get();
		//

services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package com.android.server;

		import static android.content.Intent.ACTION_UID_REMOVED;
		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_WIFI;
		import static android.net.NetworkPolicy.LIMIT_DISABLED;
		import static android.net.NetworkPolicy.WARNING_DISABLED;
		@@ -597,7 +597,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase {
		future = expectMeteredIfacesChanged();

		replay();
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
		future.get();
		verifyAndReset();

		@@ -708,7 +708,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase {
		future = expectMeteredIfacesChanged(TEST_IFACE);

		replay();
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
		future.get();
		verifyAndReset();
		}

services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package com.android.server;

		import static android.content.Intent.ACTION_UID_REMOVED;
		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_WIFI;
		import static android.net.ConnectivityManager.TYPE_WIMAX;
		@@ -192,7 +192,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
		expectNetworkStatsPoll();

		replay();
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));

		// verify service has empty history for wifi
		assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);
		@@ -246,7 +246,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
		expectNetworkStatsPoll();

		replay();
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));

		// verify service has empty history for wifi
		assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);
		@@ -337,7 +337,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
		expectNetworkStatsPoll();

		replay();
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
		verifyAndReset();

		// modify some number on wifi, and trigger poll event
		@@ -389,7 +389,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
		expectNetworkStatsPoll();

		replay();
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
		verifyAndReset();

		// create some traffic on first network
		@@ -431,7 +431,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
		expectNetworkStatsPoll();

		replay();
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
		mServiceContext.sendBroadcast(new Intent(ACTION_NETWORK_STATS_POLL));
		verifyAndReset();

		@@ -477,7 +477,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
		expectNetworkStatsPoll();

		replay();
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
		verifyAndReset();

		// create some traffic
		@@ -546,7 +546,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
		expectNetworkStatsPoll();

		replay();
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
		verifyAndReset();

		// create some traffic
		@@ -580,7 +580,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
		expectNetworkStatsPoll();

		replay();
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
		mServiceContext.sendBroadcast(new Intent(ACTION_NETWORK_STATS_POLL));
		verifyAndReset();

		@@ -617,7 +617,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
		expectNetworkStatsPoll();

		replay();
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
		verifyAndReset();

		// create some traffic for two apps
		@@ -683,7 +683,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
		expectNetworkStatsPoll();

		replay();
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
		verifyAndReset();

		// create some initial traffic
		@@ -748,7 +748,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
		expectNetworkStatsPoll();

		replay();
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
		verifyAndReset();

		// create some tethering traffic
		@@ -788,7 +788,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
		expectNetworkStatsPoll();

		replay();
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));
		mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));
		verifyAndReset();

		// create some traffic, but only for DEV, and across 1.5 buckets