LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix CTS fail to register network callback since lack of permission" am: f7d188c8c9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674237

Change-Id: I0e849ab438734eae7e0577a463459405062d8124
This commit is contained in:
Treehugger Robot
2021-04-15 15:14:34 +00:00
committed by Automerger Merge Worker
parent 0ea3966a88 f7d188c8c9
commit 9da7347603
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java
View File

@@ -17,6 +17,7 @@
package com.android.cts.net.hostside; package com.android.cts.net.hostside;
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;
import static android.net.NetworkCapabilities.SIGNAL_STRENGTH_UNSPECIFIED;
import static com.android.cts.net.hostside.NetworkPolicyTestUtils.canChangeActiveNetworkMeteredness; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.canChangeActiveNetworkMeteredness;
import static com.android.cts.net.hostside.NetworkPolicyTestUtils.getActiveNetworkCapabilities; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.getActiveNetworkCapabilities;
@@ -204,9 +205,12 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa
// Mark network as metered. // Mark network as metered.
mMeterednessConfiguration.configureNetworkMeteredness(true); mMeterednessConfiguration.configureNetworkMeteredness(true);
// Register callback // Register callback, copy the capabilities from the active network to expect the "original"
// network before disconnecting, but null out some fields to prevent over-specified.
registerNetworkCallback(new NetworkRequest.Builder() registerNetworkCallback(new NetworkRequest.Builder()
.setCapabilities(networkCapabilities).build(), mTestNetworkCallback); .setCapabilities(networkCapabilities.setTransportInfo(null))
.removeCapability(NET_CAPABILITY_NOT_METERED)
.setSignalStrength(SIGNAL_STRENGTH_UNSPECIFIED).build(), mTestNetworkCallback);
// Wait for onAvailable() callback to ensure network is available before the test // Wait for onAvailable() callback to ensure network is available before the test
// and store the default network. // and store the default network.
mNetwork = mTestNetworkCallback.expectAvailableCallbackAndGetNetwork(); mNetwork = mTestNetworkCallback.expectAvailableCallbackAndGetNetwork();

2
tests/cts/hostside/app2/src/com/android/cts/net/hostside/app2/MyService.java
View File

@@ -95,7 +95,7 @@ public class MyService extends Service {
Log.d(TAG, "unregister previous network callback: " + mNetworkCallback); Log.d(TAG, "unregister previous network callback: " + mNetworkCallback);
unregisterNetworkCallback(); unregisterNetworkCallback();
} }
Log.d(TAG, "registering network callback"); Log.d(TAG, "registering network callback for " + request);
mNetworkCallback = new ConnectivityManager.NetworkCallback() { mNetworkCallback = new ConnectivityManager.NetworkCallback() {
@Override @Override