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

Merge "Update language to comply with Android's inclusive language guidance"

Browse Source
This commit is contained in:
Chiachang Wang
2020-07-28 10:51:53 +00:00
committed by Gerrit Code Review
parent 28ced6a6ca 06defe000d
commit 2ad3ca40cb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/net/NetworkStatsFactory.java
View File

@@ -59,7 +59,7 @@ public class NetworkStatsFactory {
private static final String TAG = "NetworkStatsFactory"; private static final String TAG = "NetworkStatsFactory";
private static final boolean USE_NATIVE_PARSING = true; private static final boolean USE_NATIVE_PARSING = true;
private static final boolean SANITY_CHECK_NATIVE = false; private static final boolean VALIDATE_NATIVE_STATS = false;
/** Path to {@code /proc/net/xt_qtaguid/iface_stat_all}. */ /** Path to {@code /proc/net/xt_qtaguid/iface_stat_all}. */
private final File mStatsXtIfaceAll; private final File mStatsXtIfaceAll;
@@ -347,7 +347,7 @@ public class NetworkStatsFactory {
INTERFACES_ALL, TAG_ALL, mUseBpfStats) != 0) { INTERFACES_ALL, TAG_ALL, mUseBpfStats) != 0) {
throw new IOException("Failed to parse network stats"); throw new IOException("Failed to parse network stats");
} }
if (SANITY_CHECK_NATIVE) { if (VALIDATE_NATIVE_STATS) {
final NetworkStats javaStats = javaReadNetworkStatsDetail(mStatsXtUid, final NetworkStats javaStats = javaReadNetworkStatsDetail(mStatsXtUid,
UID_ALL, INTERFACES_ALL, TAG_ALL); UID_ALL, INTERFACES_ALL, TAG_ALL);
assertEquals(javaStats, stats); assertEquals(javaStats, stats);

2
services/core/java/com/android/server/net/NetworkStatsRecorder.java
View File

@@ -227,7 +227,7 @@ public class NetworkStatsRecorder {
for (int i = 0; i < delta.size(); i++) { for (int i = 0; i < delta.size(); i++) {
entry = delta.getValues(i, entry); entry = delta.getValues(i, entry);
// As a last-ditch sanity check, report any negative values and // As a last-ditch check, report any negative values and
// clamp them so recording below doesn't croak. // clamp them so recording below doesn't croak.
if (entry.isNegative()) { if (entry.isNegative()) {
if (mObserver != null) { if (mObserver != null) {