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

Merge "Remove the usage of hidden API and simplify the design"

Browse Source
This commit is contained in:
Lucas Lin
2021-03-30 08:01:27 +00:00
committed by Gerrit Code Review
parent 3757df2e7d 36705517ed
commit 0b66568d6a
2 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java
View File

@@ -290,25 +290,6 @@ public class UnderlyingNetworkTracker {
maybeNotifyCallback(); maybeNotifyCallback();
} }
private void handleNetworkSuspended(@NonNull Network network, boolean isSuspended) {
mVcnContext.ensureRunningOnLooperThread();
if (!isSameNetwork(mRecordInProgress, network)) {
Slog.wtf(TAG, "Invalid update to isSuspended");
return;
}
final NetworkCapabilities newCaps =
new NetworkCapabilities(mRecordInProgress.getNetworkCapabilities());
if (isSuspended) {
newCaps.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED);
} else {
newCaps.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED);
}
handleCapabilitiesChanged(network, newCaps);
}
private void handlePropertiesChanged( private void handlePropertiesChanged(
@NonNull Network network, @NonNull LinkProperties linkProperties) { @NonNull Network network, @NonNull LinkProperties linkProperties) {
mVcnContext.ensureRunningOnLooperThread(); mVcnContext.ensureRunningOnLooperThread();
@@ -366,19 +347,10 @@ public class UnderlyingNetworkTracker {
@Override @Override
public void onCapabilitiesChanged( public void onCapabilitiesChanged(
@NonNull Network network, @NonNull NetworkCapabilities networkCapabilities) { @NonNull Network network, @NonNull NetworkCapabilities networkCapabilities) {
if (networkCapabilities.equals(mRecordInProgress.getNetworkCapabilities())) return;
handleCapabilitiesChanged(network, networkCapabilities); handleCapabilitiesChanged(network, networkCapabilities);
} }
@Override
public void onNetworkSuspended(@NonNull Network network) {
handleNetworkSuspended(network, true /* isSuspended */);
}
@Override
public void onNetworkResumed(@NonNull Network network) {
handleNetworkSuspended(network, false /* isSuspended */);
}
@Override @Override
public void onLinkPropertiesChanged( public void onLinkPropertiesChanged(
@NonNull Network network, @NonNull LinkProperties linkProperties) { @NonNull Network network, @NonNull LinkProperties linkProperties) {

16
tests/vcn/java/com/android/server/vcn/UnderlyingNetworkTrackerTest.java
View File

@@ -328,7 +328,7 @@ public class UnderlyingNetworkTrackerTest {
public void testRecordTrackerCallbackNotifiedForNetworkSuspended() { public void testRecordTrackerCallbackNotifiedForNetworkSuspended() {
RouteSelectionCallback cb = verifyRegistrationOnAvailableAndGetCallback(); RouteSelectionCallback cb = verifyRegistrationOnAvailableAndGetCallback();
cb.onNetworkSuspended(mNetwork); cb.onCapabilitiesChanged(mNetwork, SUSPENDED_NETWORK_CAPABILITIES);
UnderlyingNetworkRecord expectedRecord = UnderlyingNetworkRecord expectedRecord =
new UnderlyingNetworkRecord( new UnderlyingNetworkRecord(
@@ -336,7 +336,11 @@ public class UnderlyingNetworkTrackerTest {
SUSPENDED_NETWORK_CAPABILITIES, SUSPENDED_NETWORK_CAPABILITIES,
INITIAL_LINK_PROPERTIES, INITIAL_LINK_PROPERTIES,
false /* isBlocked */); false /* isBlocked */);
verify(mNetworkTrackerCb).onSelectedUnderlyingNetworkChanged(eq(expectedRecord)); verify(mNetworkTrackerCb, times(1)).onSelectedUnderlyingNetworkChanged(eq(expectedRecord));
// onSelectedUnderlyingNetworkChanged() won't be fired twice if network capabilities doesn't
// change.
cb.onCapabilitiesChanged(mNetwork, SUSPENDED_NETWORK_CAPABILITIES);
verify(mNetworkTrackerCb, times(1)).onSelectedUnderlyingNetworkChanged(eq(expectedRecord));
} }
@Test @Test
@@ -344,7 +348,7 @@ public class UnderlyingNetworkTrackerTest {
RouteSelectionCallback cb = RouteSelectionCallback cb =
verifyRegistrationOnAvailableAndGetCallback(SUSPENDED_NETWORK_CAPABILITIES); verifyRegistrationOnAvailableAndGetCallback(SUSPENDED_NETWORK_CAPABILITIES);
cb.onNetworkResumed(mNetwork); cb.onCapabilitiesChanged(mNetwork, INITIAL_NETWORK_CAPABILITIES);
UnderlyingNetworkRecord expectedRecord = UnderlyingNetworkRecord expectedRecord =
new UnderlyingNetworkRecord( new UnderlyingNetworkRecord(
@@ -352,7 +356,11 @@ public class UnderlyingNetworkTrackerTest {
INITIAL_NETWORK_CAPABILITIES, INITIAL_NETWORK_CAPABILITIES,
INITIAL_LINK_PROPERTIES, INITIAL_LINK_PROPERTIES,
false /* isBlocked */); false /* isBlocked */);
verify(mNetworkTrackerCb).onSelectedUnderlyingNetworkChanged(eq(expectedRecord)); verify(mNetworkTrackerCb, times(1)).onSelectedUnderlyingNetworkChanged(eq(expectedRecord));
// onSelectedUnderlyingNetworkChanged() won't be fired twice if network capabilities doesn't
// change.
cb.onCapabilitiesChanged(mNetwork, INITIAL_NETWORK_CAPABILITIES);
verify(mNetworkTrackerCb, times(1)).onSelectedUnderlyingNetworkChanged(eq(expectedRecord));
} }
@Test @Test