joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

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

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

Change-Id: I7564fa7cf1f8c5d9e73044ccf8411f08f42a3c77
This commit is contained in:
Treehugger Robot 2021-04-15 16:32:49 +00:00 • committed by Automerger Merge Worker
commit 15bc33f87d
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;
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.getActiveNetworkCapabilities;
@ -204,9 +205,12 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa
// Mark network as metered.
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()
.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
// and store the default network.
mNetwork = mTestNetworkCallback.expectAvailableCallbackAndGetNetwork();

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

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