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

Adding log history for setOemNetworkPreference()

Browse source 
Adding historical logging for the setOemNetworkPreference() calls. This
will last across reboots.

Bug: 177257940
Bug: 176494815
Test: atest FrameworksNetTests
Change-Id: I4fc35fd58ff741830aa292adc1c559b4279ad8f9
This commit is contained in:
James Mattis 2021-04-06 17:07:42 -07:00
commit cb1e036fe5
1 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);