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

Merge "Include network name in validation logs for dumpsys" into nyc-dev am: 716fa18dcb

Browse Source 
am: ff71246e0d

* commit 'ff71246e0d8c8f9d28cad234bb657255de44bd05':
  Include network name in validation logs for dumpsys

Change-Id: Ie6778a47bab7e52795684d46672e42630c192d64
This commit is contained in:
Paul Jensen
2016-06-06 11:34:10 +00:00
committed by android-build-merger
parent ca7e5f5ce6 ff71246e0d
commit 71606e90ca
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,15 +433,26 @@ public class ConnectivityService extends IConnectivityManager.Stub
// Array of <Network,ReadOnlyLocalLogs> tracking network validation and results // Array of <Network,ReadOnlyLocalLogs> tracking network validation and results
private static final int MAX_VALIDATION_LOGS = 10; private static final int MAX_VALIDATION_LOGS = 10;
private final ArrayDeque<Pair<Network,ReadOnlyLocalLog>> mValidationLogs = private static class ValidationLog {
new ArrayDeque<Pair<Network,ReadOnlyLocalLog>>(MAX_VALIDATION_LOGS); final Network mNetwork;
final String mNetworkExtraInfo;
final ReadOnlyLocalLog mLog;
private void addValidationLogs(ReadOnlyLocalLog log, Network network) { ValidationLog(Network network, String networkExtraInfo, ReadOnlyLocalLog log) {
mNetwork = network;
mNetworkExtraInfo = networkExtraInfo;
mLog = log;
}
}
private final ArrayDeque<ValidationLog> mValidationLogs =
new ArrayDeque<ValidationLog>(MAX_VALIDATION_LOGS);
private void addValidationLogs(ReadOnlyLocalLog log, Network network, String networkExtraInfo) {
synchronized(mValidationLogs) { synchronized(mValidationLogs) {
while (mValidationLogs.size() >= MAX_VALIDATION_LOGS) { while (mValidationLogs.size() >= MAX_VALIDATION_LOGS) {
mValidationLogs.removeLast(); mValidationLogs.removeLast();
} }
mValidationLogs.addFirst(new Pair(network, log)); mValidationLogs.addFirst(new ValidationLog(network, networkExtraInfo, log));
} }
} }
@@ -1950,10 +1961,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
pw.println(); pw.println();
synchronized (mValidationLogs) { synchronized (mValidationLogs) {
pw.println("mValidationLogs (most recent first):"); pw.println("mValidationLogs (most recent first):");
for (Pair<Network,ReadOnlyLocalLog> p : mValidationLogs) { for (ValidationLog p : mValidationLogs) {
pw.println(p.first); pw.println(p.mNetwork + " - " + p.mNetworkExtraInfo);
pw.increaseIndent(); pw.increaseIndent();
p.second.dump(fd, pw, args); p.mLog.dump(fd, pw, args);
pw.decreaseIndent(); pw.decreaseIndent();
} }
} }
@@ -4256,7 +4267,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
synchronized (this) { synchronized (this) {
nai.networkMonitor.systemReady = mSystemReady; nai.networkMonitor.systemReady = mSystemReady;
} }
addValidationLogs(nai.networkMonitor.getValidationLogs(), nai.network); addValidationLogs(nai.networkMonitor.getValidationLogs(), nai.network,
networkInfo.getExtraInfo());
if (DBG) log("registerNetworkAgent " + nai); if (DBG) log("registerNetworkAgent " + nai);
mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_AGENT, nai)); mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_AGENT, nai));
return nai.network.netId; return nai.network.netId;