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

nits removing extra space, change method name, etc

Browse Source 
Minor cleanup as per nit comments on approved CLs in the relation chain.

Namely:
- removing an extranous space
- changing requestsSortedById() to be package private
- changing releaseNetworkRequest() name to releaseNetworkRequests()
- adding final in a couple spots
- added some test requests in testDumpDoesNotCrash()

Bug: 173145245
Bug: 173292541
Bug: 173146509
Bug: 171991028
Test: atest FrameworksNetTests
Change-Id: I177ec6072a44acd247022b65b56e90cc231094b9
This commit is contained in:
James Mattis
2020-11-20 16:08:10 -08:00
parent cd7634501f
commit a152f88e4f
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -1377,7 +1377,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
final String action = blocked ? "BLOCKED" : "UNBLOCKED";
final NetworkRequest satisfiedRequest = nri.getSatisfiedRequest();
int requestId = satisfiedRequest != null
final int requestId = satisfiedRequest != null
? satisfiedRequest.requestId : nri.mRequests.get(0).requestId;
mNetworkInfoBlockingLogs.log(String.format(
"%s %d(%d) on netId %d", action, nri.mUid, requestId, net.getNetId()));
@@ -2712,7 +2712,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
* Return an array of all current NetworkRequest sorted by request id.
*/
@VisibleForTesting
protected NetworkRequestInfo[] requestsSortedById() {
NetworkRequestInfo[] requestsSortedById() {
NetworkRequestInfo[] requests = new NetworkRequestInfo[0];
requests = mNetworkRequests.values().toArray(requests);
// Sort the array based off the NRI containing the min requestId in its requests.
@@ -5527,7 +5527,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
public void binderDied() {
log("ConnectivityService NetworkRequestInfo binderDied(" +
mRequests + ", " + mBinder + ")");
releaseNetworkRequest(mRequests);
releaseNetworkRequests(mRequests);
}
@Override
@@ -5854,7 +5854,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
return mNextNetworkProviderId.getAndIncrement();
}
private void releaseNetworkRequest(List<NetworkRequest> networkRequests) {
private void releaseNetworkRequests(List<NetworkRequest> networkRequests) {
for (int i = 0; i < networkRequests.size(); i++) {
releaseNetworkRequest(networkRequests.get(i));
}

15
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -7812,7 +7812,16 @@ public class ConnectivityServiceTest {
@Test
public void testDumpDoesNotCrash() {
StringWriter stringWriter = new StringWriter();
// Filing a couple requests prior to testing the dump.
final TestNetworkCallback genericNetworkCallback = new TestNetworkCallback();
final TestNetworkCallback wifiNetworkCallback = new TestNetworkCallback();
final NetworkRequest genericRequest = new NetworkRequest.Builder()
.clearCapabilities().build();
final NetworkRequest wifiRequest = new NetworkRequest.Builder()
.addTransportType(TRANSPORT_WIFI).build();
mCm.registerNetworkCallback(genericRequest, genericNetworkCallback);
mCm.registerNetworkCallback(wifiRequest, wifiNetworkCallback);
final StringWriter stringWriter = new StringWriter();
mService.dump(new FileDescriptor(), new PrintWriter(stringWriter), new String[0]);
@@ -7834,11 +7843,11 @@ public class ConnectivityServiceTest {
mCm.registerNetworkCallback(wifiRequest, wifiNetworkCallback);
mCm.registerNetworkCallback(cellRequest, cellNetworkCallback);
ConnectivityService.NetworkRequestInfo[] nriOutput = mService.requestsSortedById();
final ConnectivityService.NetworkRequestInfo[] nriOutput = mService.requestsSortedById();
assertTrue(nriOutput.length > 1);
for (int i = 0; i < nriOutput.length - 1; i++) {
boolean isRequestIdInOrder =
final boolean isRequestIdInOrder =
nriOutput[i].mRequests.get(0).requestId
< nriOutput[i + 1].mRequests.get(0).requestId;
assertTrue(isRequestIdInOrder);