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

Merge "Factorize describeDifferences"

Browse source
This commit is contained in:
Jean Chalard 2023-01-28 04:49:01 +00:00 • committed by Gerrit Code Review
commit 74aaf2c5cf
2 changed files with 8 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

23
framework/src/android/net/NetworkCapabilities.java
View file

@ -18,6 +18,7 @@ package android.net;
import static com.android.internal.annotations.VisibleForTesting.Visibility.PRIVATE;
import static com.android.net.module.util.BitUtils.appendStringRepresentationOfBitMaskToStringBuilder;
import static com.android.net.module.util.BitUtils.describeDifferences;
import android.annotation.IntDef;
import android.annotation.LongDef;
@ -2069,30 +2070,14 @@ public final class NetworkCapabilities implements Parcelable {
* Returns a short but human-readable string of updates from an older set of capabilities.
* @param old the old capabilities to diff from
* @return a string fit for logging differences, or null if no differences.
* this never returns the empty string.
* this never returns the empty string. See BitUtils#describeDifferences.
* @hide
*/
@Nullable
public String describeCapsDifferencesFrom(@Nullable final NetworkCapabilities old) {
final long oldCaps = null == old ? 0 : old.mNetworkCapabilities;
final long changed = oldCaps ^ mNetworkCapabilities;
if (0 == changed) return null;
// If the control reaches here, there are changes (additions, removals, or both) so
// the code below is guaranteed to add something to the string and can't return "".
final long removed = oldCaps & changed;
final long added = mNetworkCapabilities & changed;
final StringBuilder sb = new StringBuilder();
if (0 != removed) {
sb.append("-");
appendStringRepresentationOfBitMaskToStringBuilder(sb, removed,
NetworkCapabilities::capabilityNameOf, "-");
}
if (0 != added) {
sb.append("+");
appendStringRepresentationOfBitMaskToStringBuilder(sb, added,
NetworkCapabilities::capabilityNameOf, "+");
}
return sb.toString();
return describeDifferences(oldCaps, mNetworkCapabilities,
NetworkCapabilities::capabilityNameOf);
}
/**

25
service/src/com/android/server/connectivity/FullScore.java
View file

@ -23,7 +23,7 @@ import static android.net.NetworkCapabilities.TRANSPORT_VPN;
import static android.net.NetworkScore.KEEP_CONNECTED_NONE;
import static android.net.NetworkScore.POLICY_YIELD_TO_BAD_WIFI;
import static com.android.net.module.util.BitUtils.appendStringRepresentationOfBitMaskToStringBuilder;
import static com.android.net.module.util.BitUtils.describeDifferences;
import android.annotation.NonNull;
import android.annotation.Nullable;
@ -338,31 +338,14 @@ public class FullScore {
/**
* Returns a short but human-readable string of updates from an older score.
* @param old the old capabilities to diff from
* @param old the old score to diff from
* @return a string fit for logging differences, or null if no differences.
* this method cannot return the empty string.
* this method cannot return the empty string. See BitUtils#describeDifferences.
*/
@Nullable
public String describeDifferencesFrom(@Nullable final FullScore old) {
final long oldPolicies = null == old ? 0 : old.mPolicies;
final long changed = oldPolicies ^ mPolicies;
if (0 == changed) return null;
// If the control reaches here, there are changes (additions, removals, or both) so
// the code below is guaranteed to add something to the string and can't return "".
final long removed = oldPolicies & changed;
final long added = mPolicies & changed;
final StringBuilder sb = new StringBuilder();
if (0 != removed) {
sb.append("-");
appendStringRepresentationOfBitMaskToStringBuilder(sb, removed,
FullScore::policyNameOf, "-");
}
if (0 != added) {
sb.append("+");
appendStringRepresentationOfBitMaskToStringBuilder(sb, added,
FullScore::policyNameOf, "+");
}
return sb.toString();
return describeDifferences(oldPolicies, mPolicies, FullScore::policyNameOf);
}
// Example output :