From e1e361a6690542cb56a4d056a4db733631cb857d Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Wed, 30 Mar 2016 11:14:39 -0700 Subject: [PATCH] Excluded certain APNs (e.g. IMS) from mobile data usage. Added not_metered capability to a mobile network if none of its associated APN types are metered. Also used not_metered capability to determine if a network should be accounted for data usage or not instead of using network type, which is always MOBILE after refactoring. Will add VT usage support in next phase. bug: 20888836 Change-Id: Id692cb856be9a47d0e918371112630128965b1bb --- .../net/NetworkStatsCollectionTest.java | 2 +- .../server/net/NetworkStatsObserversTest.java | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/services/tests/servicestests/src/com/android/server/net/NetworkStatsCollectionTest.java b/services/tests/servicestests/src/com/android/server/net/NetworkStatsCollectionTest.java index 6026644593..9f53c87834 100644 --- a/services/tests/servicestests/src/com/android/server/net/NetworkStatsCollectionTest.java +++ b/services/tests/servicestests/src/com/android/server/net/NetworkStatsCollectionTest.java @@ -162,7 +162,7 @@ public class NetworkStatsCollectionTest extends AndroidTestCase { final NetworkStats.Entry entry = new NetworkStats.Entry(); final NetworkIdentitySet identSet = new NetworkIdentitySet(); identSet.add(new NetworkIdentity(TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_UNKNOWN, - TEST_IMSI, null, false)); + TEST_IMSI, null, false, true)); int myUid = Process.myUid(); int otherUidInSameUser = Process.myUid() + 1; diff --git a/services/tests/servicestests/src/com/android/server/net/NetworkStatsObserversTest.java b/services/tests/servicestests/src/com/android/server/net/NetworkStatsObserversTest.java index 82c6b6d880..cff5876f85 100644 --- a/services/tests/servicestests/src/com/android/server/net/NetworkStatsObserversTest.java +++ b/services/tests/servicestests/src/com/android/server/net/NetworkStatsObserversTest.java @@ -283,7 +283,7 @@ public class NetworkStatsObserversTest extends TestCase { NetworkIdentitySet identSet = new NetworkIdentitySet(); identSet.add(new NetworkIdentity( TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_UNKNOWN, - IMSI_1, null /* networkId */, false /* roaming */)); + IMSI_1, null /* networkId */, false /* roaming */, true /* metered */)); mActiveIfaces.put(TEST_IFACE, identSet); // Baseline @@ -315,7 +315,7 @@ public class NetworkStatsObserversTest extends TestCase { NetworkIdentitySet identSet = new NetworkIdentitySet(); identSet.add(new NetworkIdentity( TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_UNKNOWN, - IMSI_1, null /* networkId */, false /* roaming */)); + IMSI_1, null /* networkId */, false /* roaming */, true /* metered */)); mActiveIfaces.put(TEST_IFACE, identSet); // Baseline @@ -354,7 +354,7 @@ public class NetworkStatsObserversTest extends TestCase { NetworkIdentitySet identSet = new NetworkIdentitySet(); identSet.add(new NetworkIdentity( TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_UNKNOWN, - IMSI_1, null /* networkId */, false /* roaming */)); + IMSI_1, null /* networkId */, false /* roaming */, true /* metered */)); mActiveIfaces.put(TEST_IFACE, identSet); // Baseline @@ -393,13 +393,13 @@ public class NetworkStatsObserversTest extends TestCase { NetworkIdentitySet identSet1 = new NetworkIdentitySet(); identSet1.add(new NetworkIdentity( TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_UNKNOWN, - IMSI_1, null /* networkId */, false /* roaming */)); + IMSI_1, null /* networkId */, false /* roaming */, true /* metered */)); mActiveIfaces.put(TEST_IFACE, identSet1); NetworkIdentitySet identSet2 = new NetworkIdentitySet(); identSet2.add(new NetworkIdentity( TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_UNKNOWN, - IMSI_2, null /* networkId */, false /* roaming */)); + IMSI_2, null /* networkId */, false /* roaming */, true /* metered */)); mActiveIfaces.put(TEST_IFACE2, identSet2); // Baseline @@ -441,7 +441,7 @@ public class NetworkStatsObserversTest extends TestCase { NetworkIdentitySet identSet = new NetworkIdentitySet(); identSet.add(new NetworkIdentity( TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_UNKNOWN, - IMSI_1, null /* networkId */, false /* roaming */)); + IMSI_1, null /* networkId */, false /* roaming */, true /* metered */)); mActiveUidIfaces.put(TEST_IFACE, identSet); // Baseline @@ -481,7 +481,7 @@ public class NetworkStatsObserversTest extends TestCase { NetworkIdentitySet identSet = new NetworkIdentitySet(); identSet.add(new NetworkIdentity( TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_UNKNOWN, - IMSI_1, null /* networkId */, false /* roaming */)); + IMSI_1, null /* networkId */, false /* roaming */, true /* metered */)); mActiveUidIfaces.put(TEST_IFACE, identSet); // Baseline @@ -521,7 +521,7 @@ public class NetworkStatsObserversTest extends TestCase { NetworkIdentitySet identSet = new NetworkIdentitySet(); identSet.add(new NetworkIdentity( TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_UNKNOWN, - IMSI_1, null /* networkId */, false /* roaming */)); + IMSI_1, null /* networkId */, false /* roaming */, true /* metered */)); mActiveUidIfaces.put(TEST_IFACE, identSet); // Baseline @@ -561,7 +561,7 @@ public class NetworkStatsObserversTest extends TestCase { NetworkIdentitySet identSet = new NetworkIdentitySet(); identSet.add(new NetworkIdentity( TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_UNKNOWN, - IMSI_1, null /* networkId */, false /* roaming */)); + IMSI_1, null /* networkId */, false /* roaming */, true /* metered */)); mActiveUidIfaces.put(TEST_IFACE, identSet); // Baseline @@ -601,7 +601,7 @@ public class NetworkStatsObserversTest extends TestCase { NetworkIdentitySet identSet = new NetworkIdentitySet(); identSet.add(new NetworkIdentity( TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_UNKNOWN, - IMSI_1, null /* networkId */, false /* roaming */)); + IMSI_1, null /* networkId */, false /* roaming */, true /* metered */)); mActiveUidIfaces.put(TEST_IFACE, identSet); // Baseline