Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Mobile Data State on subscription changes." am: cb85575990

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1740514

Change-Id: I640b0f97b661a6595b32a3d11d1966b2af752815
This commit is contained in:
Cody Kesting
2021-06-18 02:05:16 +00:00
committed by Automerger Merge Worker
parent 1e848eaeb5 cb85575990
commit e8dca29970
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/vcn/Vcn.java
View File

@@ -453,6 +453,10 @@ public class Vcn extends Handler {
for (VcnGatewayConnection gatewayConnection : mVcnGatewayConnections.values()) { for (VcnGatewayConnection gatewayConnection : mVcnGatewayConnections.values()) {
gatewayConnection.updateSubscriptionSnapshot(mLastSnapshot); gatewayConnection.updateSubscriptionSnapshot(mLastSnapshot);
} }
// Update the mobile data state after updating the subscription snapshot as a change in
// subIds for a subGroup may affect the mobile data state.
handleMobileDataToggled();
} }
private void handleMobileDataToggled() { private void handleMobileDataToggled() {

21
tests/vcn/java/com/android/server/vcn/VcnTest.java
View File

@@ -242,6 +242,27 @@ public class VcnTest {
verifyUpdateSubscriptionSnapshotNotifiesGatewayConnections(VCN_STATUS_CODE_SAFE_MODE); verifyUpdateSubscriptionSnapshotNotifiesGatewayConnections(VCN_STATUS_CODE_SAFE_MODE);
} }
@Test
public void testSubscriptionSnapshotUpdatesMobileDataState() {
final NetworkRequestListener requestListener = verifyAndGetRequestListener();
startVcnGatewayWithCapabilities(requestListener, TEST_CAPS[0]);
// Expect mobile data enabled from setUp()
assertTrue(mVcn.isMobileDataEnabled());
final TelephonySubscriptionSnapshot updatedSnapshot =
mock(TelephonySubscriptionSnapshot.class);
doReturn(TEST_SUB_IDS_IN_GROUP)
.when(updatedSnapshot)
.getAllSubIdsInGroup(eq(TEST_SUB_GROUP));
doReturn(false).when(mTelephonyManager).isDataEnabled();
mVcn.updateSubscriptionSnapshot(updatedSnapshot);
mTestLooper.dispatchAll();
assertFalse(mVcn.isMobileDataEnabled());
}
private void triggerVcnRequestListeners(NetworkRequestListener requestListener) { private void triggerVcnRequestListeners(NetworkRequestListener requestListener) {
for (final int[] caps : TEST_CAPS) { for (final int[] caps : TEST_CAPS) {
startVcnGatewayWithCapabilities(requestListener, caps); startVcnGatewayWithCapabilities(requestListener, caps);