Merge changes from topic "ms17-multipath"
* changes: [MS17.3] Remove NetworkStatsManagerInternal dependency [MS17.2] Fix remaining daily budget assertion
This commit is contained in:
Junyu Lai
@@ -35,10 +35,12 @@ import static org.mockito.ArgumentMatchers.argThat;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.doCallRealMethod;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.usage.NetworkStats;
|
||||
import android.app.usage.NetworkStatsManager;
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
@@ -60,6 +62,7 @@ import android.provider.Settings;
|
||||
import android.telephony.TelephonyManager;
|
||||
import android.test.mock.MockContentResolver;
|
||||
import android.util.DataUnit;
|
||||
import android.util.Range;
|
||||
import android.util.RecurrenceRule;
|
||||
|
||||
import androidx.test.filters.SmallTest;
|
||||
@@ -68,7 +71,6 @@ import com.android.internal.R;
|
||||
import com.android.internal.util.test.FakeSettingsProvider;
|
||||
import com.android.server.LocalServices;
|
||||
import com.android.server.net.NetworkPolicyManagerInternal;
|
||||
import com.android.server.net.NetworkStatsManagerInternal;
|
||||
import com.android.testutils.DevSdkIgnoreRule;
|
||||
import com.android.testutils.DevSdkIgnoreRunner;
|
||||
|
||||
@@ -87,6 +89,7 @@ import java.time.Period;
|
||||
import java.time.ZoneId;
|
||||
import java.time.ZonedDateTime;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import java.util.Set;
|
||||
|
||||
@RunWith(DevSdkIgnoreRunner.class)
|
||||
@SmallTest
|
||||
@@ -106,7 +109,6 @@ public class MultipathPolicyTrackerTest {
|
||||
@Mock private NetworkPolicyManager mNPM;
|
||||
@Mock private NetworkStatsManager mStatsManager;
|
||||
@Mock private NetworkPolicyManagerInternal mNPMI;
|
||||
@Mock private NetworkStatsManagerInternal mNetworkStatsManagerInternal;
|
||||
@Mock private TelephonyManager mTelephonyManager;
|
||||
private MockContentResolver mContentResolver;
|
||||
|
||||
@@ -164,9 +166,6 @@ public class MultipathPolicyTrackerTest {
|
||||
LocalServices.removeServiceForTest(NetworkPolicyManagerInternal.class);
|
||||
LocalServices.addService(NetworkPolicyManagerInternal.class, mNPMI);
|
||||
|
||||
LocalServices.removeServiceForTest(NetworkStatsManagerInternal.class);
|
||||
LocalServices.addService(NetworkStatsManagerInternal.class, mNetworkStatsManagerInternal);
|
||||
|
||||
mTracker = new MultipathPolicyTracker(mContext, mHandler, mDeps);
|
||||
}
|
||||
|
||||
@@ -201,6 +200,11 @@ public class MultipathPolicyTrackerTest {
|
||||
when(mNPMI.getSubscriptionOpportunisticQuota(TEST_NETWORK, QUOTA_TYPE_MULTIPATH))
|
||||
.thenReturn(subscriptionQuota);
|
||||
|
||||
// Prepare stats to be mocked.
|
||||
final NetworkStats.Bucket mockedStatsBucket = mock(NetworkStats.Bucket.class);
|
||||
when(mockedStatsBucket.getTxBytes()).thenReturn(usedBytesToday / 3);
|
||||
when(mockedStatsBucket.getRxBytes()).thenReturn(usedBytesToday - usedBytesToday / 3);
|
||||
|
||||
// Setup user policy warning / limit
|
||||
if (policyWarning != WARNING_DISABLED || policyLimit != LIMIT_DISABLED) {
|
||||
final Instant recurrenceStart = Instant.parse("2017-04-01T00:00:00Z");
|
||||
@@ -214,7 +218,9 @@ public class MultipathPolicyTrackerTest {
|
||||
final boolean snoozeLimit = policyLimit == POLICY_SNOOZED;
|
||||
when(mNPM.getNetworkPolicies()).thenReturn(new NetworkPolicy[] {
|
||||
new NetworkPolicy(
|
||||
NetworkTemplate.buildTemplateMobileWildcard(),
|
||||
new NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE)
|
||||
.setSubscriberIds(Set.of(TEST_IMSI1))
|
||||
.setMeteredness(android.net.NetworkStats.METERED_YES).build(),
|
||||
recurrenceRule,
|
||||
snoozeWarning ? 0 : policyWarning,
|
||||
snoozeLimit ? 0 : policyLimit,
|
||||
@@ -224,6 +230,13 @@ public class MultipathPolicyTrackerTest {
|
||||
true /* metered */,
|
||||
false /* inferred */)
|
||||
});
|
||||
|
||||
// Mock stats for this month.
|
||||
final Range<ZonedDateTime> cycleOfTheMonth = recurrenceRule.cycleIterator().next();
|
||||
when(mStatsManager.querySummaryForDevice(any(),
|
||||
eq(cycleOfTheMonth.getLower().toInstant().toEpochMilli()),
|
||||
eq(cycleOfTheMonth.getUpper().toInstant().toEpochMilli())))
|
||||
.thenReturn(mockedStatsBucket);
|
||||
} else {
|
||||
when(mNPM.getNetworkPolicies()).thenReturn(new NetworkPolicy[0]);
|
||||
}
|
||||
@@ -235,10 +248,10 @@ public class MultipathPolicyTrackerTest {
|
||||
when(mResources.getInteger(R.integer.config_networkDefaultDailyMultipathQuotaBytes))
|
||||
.thenReturn((int) defaultResSetting);
|
||||
|
||||
when(mNetworkStatsManagerInternal.getNetworkTotalBytes(
|
||||
any(),
|
||||
// Mock stats for today.
|
||||
when(mStatsManager.querySummaryForDevice(any(),
|
||||
eq(startOfDay.toInstant().toEpochMilli()),
|
||||
eq(now.toInstant().toEpochMilli()))).thenReturn(usedBytesToday);
|
||||
eq(now.toInstant().toEpochMilli()))).thenReturn(mockedStatsBucket);
|
||||
|
||||
ArgumentCaptor<ConnectivityManager.NetworkCallback> networkCallback =
|
||||
ArgumentCaptor.forClass(ConnectivityManager.NetworkCallback.class);
|
||||
@@ -291,8 +304,10 @@ public class MultipathPolicyTrackerTest {
|
||||
testGetMultipathPreference(
|
||||
DataUnit.MEGABYTES.toBytes(7) /* usedBytesToday */,
|
||||
OPPORTUNISTIC_QUOTA_UNKNOWN,
|
||||
// 29 days from Apr. 2nd to May 1st
|
||||
DataUnit.MEGABYTES.toBytes(15 * 29 * 20) /* policyWarning */,
|
||||
// Remaining days are 29 days from Apr. 2nd to May 1st.
|
||||
// Set limit so that 15MB * remaining days will be 5% of the remaining limit,
|
||||
// so it will be 15 * 29 / 0.05 + used bytes.
|
||||
DataUnit.MEGABYTES.toBytes(15 * 29 * 20 + 7) /* policyWarning */,
|
||||
LIMIT_DISABLED,
|
||||
DataUnit.MEGABYTES.toBytes(12) /* defaultGlobalSetting */,
|
||||
2_500_000 /* defaultResSetting */,
|
||||
@@ -308,9 +323,11 @@ public class MultipathPolicyTrackerTest {
|
||||
testGetMultipathPreference(
|
||||
DataUnit.MEGABYTES.toBytes(7) /* usedBytesToday */,
|
||||
OPPORTUNISTIC_QUOTA_UNKNOWN,
|
||||
// 29 days from Apr. 2nd to May 1st
|
||||
POLICY_SNOOZED /* policyWarning */,
|
||||
DataUnit.MEGABYTES.toBytes(15 * 29 * 20) /* policyLimit */,
|
||||
// Remaining days are 29 days from Apr. 2nd to May 1st.
|
||||
// Set limit so that 15MB * remaining days will be 5% of the remaining limit,
|
||||
// so it will be 15 * 29 / 0.05 + used bytes.
|
||||
DataUnit.MEGABYTES.toBytes(15 * 29 * 20 + 7) /* policyLimit */,
|
||||
DataUnit.MEGABYTES.toBytes(12) /* defaultGlobalSetting */,
|
||||
2_500_000 /* defaultResSetting */,
|
||||
false /* roaming */);
|
||||
|
||||
Reference in New Issue
Block a user