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

Merge "Adding log history for setOemNetworkPreference()" am: 7fe91d40f1 am: 98b7cc58c6

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

Change-Id: Ibc8b620025d5d61d34034f29e6f50d48f30b9b34
This commit is contained in:
James Mattis
2021-04-09 17:07:33 +00:00
committed by Automerger Merge Worker
parent 05d12ae637 98b7cc58c6
commit 3842f94fe3
2 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2884,13 +2884,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
pw.println();
pw.println("mNetworkRequestInfoLogs (most recent first):");
pw.increaseIndent();
mNetworkRequestInfoLogs.reverseDump(fd, pw, args);
mNetworkRequestInfoLogs.reverseDump(pw);
pw.decreaseIndent();
pw.println();
pw.println("mNetworkInfoBlockingLogs (most recent first):");
pw.increaseIndent();
mNetworkInfoBlockingLogs.reverseDump(fd, pw, args);
mNetworkInfoBlockingLogs.reverseDump(pw);
pw.decreaseIndent();
pw.println();
@@ -2904,7 +2904,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
long duration = SystemClock.elapsedRealtime() - mLastWakeLockAcquireTimestamp;
pw.println("currently holding WakeLock for: " + (duration / 1000) + "s");
}
mWakelockLogs.reverseDump(fd, pw, args);
mWakelockLogs.reverseDump(pw);
pw.println();
pw.println("bandwidth update requests (by uid):");
@@ -2916,7 +2916,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
}
pw.decreaseIndent();
pw.decreaseIndent();
pw.println();
pw.println("mOemNetworkPreferencesLogs (most recent first):");
pw.increaseIndent();
mOemNetworkPreferencesLogs.reverseDump(pw);
pw.decreaseIndent();
}
@@ -6205,6 +6210,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
@NonNull
private ProfileNetworkPreferences mProfileNetworkPreferences = new ProfileNetworkPreferences();
// OemNetworkPreferences activity String log entries.
private static final int MAX_OEM_NETWORK_PREFERENCE_LOGS = 20;
@NonNull
private final LocalLog mOemNetworkPreferencesLogs =
new LocalLog(MAX_OEM_NETWORK_PREFERENCE_LOGS);
/**
* Determine whether a given package has a mapping in the current OemNetworkPreferences.
* @param packageName the package name to check existence of a mapping for.
@@ -9637,6 +9648,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
return;
}
mOemNetworkPreferencesLogs.log("UPDATE INITIATED: " + preference);
final ArraySet<NetworkRequestInfo> nris =
new OemNetworkRequestFactory().createNrisFromOemNetworkPreferences(preference);
replaceDefaultNetworkRequestsForPreference(nris);

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

@@ -18,6 +18,7 @@ package com.android.server;
import static android.Manifest.permission.CHANGE_NETWORK_STATE;
import static android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS;
import static android.Manifest.permission.DUMP;
import static android.Manifest.permission.NETWORK_FACTORY;
import static android.Manifest.permission.NETWORK_SETTINGS;
import static android.app.PendingIntent.FLAG_IMMUTABLE;
@@ -356,6 +357,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import kotlin.reflect.KClass;
@@ -9950,6 +9953,7 @@ public class ConnectivityServiceTest {
@Test
public void testDumpDoesNotCrash() {
mServiceContext.setPermission(DUMP, PERMISSION_GRANTED);
// Filing a couple requests prior to testing the dump.
final TestNetworkCallback genericNetworkCallback = new TestNetworkCallback();
final TestNetworkCallback wifiNetworkCallback = new TestNetworkCallback();
@@ -11705,6 +11709,33 @@ public class ConnectivityServiceTest {
// default callbacks will be unregistered in tearDown
}
@Test
public void testSetOemNetworkPreferenceLogsRequest() throws Exception {
mServiceContext.setPermission(DUMP, PERMISSION_GRANTED);
@OemNetworkPreferences.OemNetworkPreference final int networkPref =
OEM_NETWORK_PREFERENCE_OEM_PAID;
final StringWriter stringWriter = new StringWriter();
final String logIdentifier = "UPDATE INITIATED: OemNetworkPreferences";
final Pattern pattern = Pattern.compile(logIdentifier);
final int expectedNumLogs = 2;
final UidRangeParcel[] uidRanges =
toUidRangeStableParcels(uidRangesForUids(TEST_PACKAGE_UID));
// Call twice to generate two logs.
setupSetOemNetworkPreferenceForPreferenceTest(networkPref, uidRanges, TEST_PACKAGE_NAME);
setupSetOemNetworkPreferenceForPreferenceTest(networkPref, uidRanges, TEST_PACKAGE_NAME);
mService.dump(new FileDescriptor(), new PrintWriter(stringWriter), new String[0]);
final String dumpOutput = stringWriter.toString();
final Matcher matcher = pattern.matcher(dumpOutput);
int count = 0;
while (matcher.find()) {
count++;
}
assertEquals(expectedNumLogs, count);
}
@Test
public void testGetAllNetworkStateSnapshot() throws Exception {
verifyNoNetwork();