Merge "Fix test-related build breakage." (b3610666) · Commits · e / os / android_frameworks_base

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

+12 −33

Original line number	Diff line number	Diff line
		@@ -55,7 +55,6 @@ import android.os.Environment;
		import android.os.Handler;
		import android.os.HandlerThread;
		import android.os.IPowerManager;
		import android.os.Message;
		import android.os.RemoteCallbackList;
		import android.os.RemoteException;
		import android.telephony.TelephonyManager;
		@@ -126,8 +125,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

		private static final long TIME_CACHE_MAX_AGE = DAY_IN_MILLIS;

		private static final int MSG_RULES_CHANGED = 0x1;

		private final Context mContext;
		private final IActivityManager mActivityManager;
		private final IPowerManager mPowerManager;
		@@ -186,7 +183,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

		mHandlerThread = new HandlerThread(TAG);
		mHandlerThread.start();
		mHandler = new Handler(mHandlerThread.getLooper(), mHandlerCallback);
		mHandler = new Handler(mHandlerThread.getLooper());

		mPolicyFile = new AtomicFile(new File(systemDir, "netpolicy.xml"));
		}
		@@ -718,23 +715,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		mUidRules.put(uid, uidRules);

		// dispatch changed rule to existing listeners
		mHandler.obtainMessage(MSG_RULES_CHANGED, uid, uidRules).sendToTarget();

		}

		private String getActiveSubscriberId() {
		final TelephonyManager telephony = (TelephonyManager) mContext.getSystemService(
		Context.TELEPHONY_SERVICE);
		return telephony.getSubscriberId();
		}

		private Handler.Callback mHandlerCallback = new Handler.Callback() {
		/** {@inheritDoc} */
		public boolean handleMessage(Message msg) {
		switch (msg.what) {
		case MSG_RULES_CHANGED: {
		final int uid = msg.arg1;
		final int uidRules = msg.arg2;
		final int length = mListeners.beginBroadcast();
		for (int i = 0; i < length; i++) {
		final INetworkPolicyListener listener = mListeners.getBroadcastItem(i);
		@@ -746,14 +726,13 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		}
		}
		mListeners.finishBroadcast();
		return true;
		}
		default: {
		return false;
		}
		}

		private String getActiveSubscriberId() {
		final TelephonyManager telephony = (TelephonyManager) mContext.getSystemService(
		Context.TELEPHONY_SERVICE);
		return telephony.getSubscriberId();
		}
		};

		private static void collectKeys(SparseIntArray source, SparseBooleanArray target) {
		final int size = source.size();

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

+9 −5

Original line number	Diff line number	Diff line
		@@ -297,7 +297,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase {
		final long currentTime = parseTime("2007-11-14T00:00:00.000Z");
		final long expectedCycle = parseTime("2007-11-05T00:00:00.000Z");

		final NetworkPolicy policy = new NetworkPolicy(5, 1024L, 1024L);
		final NetworkPolicy policy = new NetworkPolicy(TEMPLATE_WIFI, null, 5, 1024L, 1024L);
		final long actualCycle = computeLastCycleBoundary(currentTime, policy);
		assertEquals(expectedCycle, actualCycle);
		}
		@@ -307,7 +307,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase {
		final long currentTime = parseTime("2007-11-14T00:00:00.000Z");
		final long expectedCycle = parseTime("2007-10-20T00:00:00.000Z");

		final NetworkPolicy policy = new NetworkPolicy(20, 1024L, 1024L);
		final NetworkPolicy policy = new NetworkPolicy(TEMPLATE_WIFI, null, 20, 1024L, 1024L);
		final long actualCycle = computeLastCycleBoundary(currentTime, policy);
		assertEquals(expectedCycle, actualCycle);
		}
		@@ -317,7 +317,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase {
		final long currentTime = parseTime("2007-02-14T00:00:00.000Z");
		final long expectedCycle = parseTime("2007-01-30T00:00:00.000Z");

		final NetworkPolicy policy = new NetworkPolicy(30, 1024L, 1024L);
		final NetworkPolicy policy = new NetworkPolicy(TEMPLATE_WIFI, null, 30, 1024L, 1024L);
		final long actualCycle = computeLastCycleBoundary(currentTime, policy);
		assertEquals(expectedCycle, actualCycle);
		}
		@@ -327,7 +327,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase {
		final long currentTime = parseTime("2007-03-14T00:00:00.000Z");
		final long expectedCycle = parseTime("2007-03-01T00:00:00.000Z");

		final NetworkPolicy policy = new NetworkPolicy(30, 1024L, 1024L);
		final NetworkPolicy policy = new NetworkPolicy(TEMPLATE_WIFI, null, 30, 1024L, 1024L);
		final long actualCycle = computeLastCycleBoundary(currentTime, policy);
		assertEquals(expectedCycle, actualCycle);
		}
		@@ -366,7 +366,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase {
		// TODO: write up NetworkManagementService mock

		replay();
		mService.setNetworkPolicy(TEMPLATE_WIFI, null, new NetworkPolicy(CYCLE_DAY, 1024L, 2048L));
		setNetworkPolicies(new NetworkPolicy(TEMPLATE_WIFI, null, CYCLE_DAY, 1024L, 2048L));
		verifyAndReset();
		}

		@@ -376,6 +376,10 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase {
		return result.toMillis(true);
		}

		private void setNetworkPolicies(NetworkPolicy... policies) {
		mService.setNetworkPolicies(policies);
		}

		private static NetworkState buildWifi() {
		final NetworkInfo info = new NetworkInfo(TYPE_WIFI, 0, null, null);
		info.setDetailedState(DetailedState.CONNECTED, null, null);