Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topics "api-fix-networkagent", "satisfiedby" am: 90c292b13e

Browse Source 
Change-Id: I1149e5d0c93885d401817d65af02b6ae47f51dfc
This commit is contained in:
Chalard Jean
2020-04-02 06:15:02 +00:00
committed by Automerger Merge Worker
parent 150ebad774 90c292b13e
commit 3dcfc3e5c6
15 changed files with 52 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -29236,11 +29236,11 @@ package android.net {
}
public class NetworkRequest implements android.os.Parcelable {
method public boolean canBeSatisfiedBy(@Nullable android.net.NetworkCapabilities);
method public int describeContents();
method @Nullable public android.net.NetworkSpecifier getNetworkSpecifier();
method public boolean hasCapability(int);
method public boolean hasTransport(int);
method public boolean satisfiedBy(@Nullable android.net.NetworkCapabilities);
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkRequest> CREATOR;
}

15
api/system-current.txt
View File

@@ -4519,7 +4519,6 @@ package android.net {
public final class MatchAllNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
ctor public MatchAllNetworkSpecifier();
method public int describeContents();
method public boolean satisfiedBy(android.net.NetworkSpecifier);
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.MatchAllNetworkSpecifier> CREATOR;
}
@@ -4672,8 +4671,8 @@ package android.net {
}
public abstract class NetworkSpecifier {
method public boolean canBeSatisfiedBy(@Nullable android.net.NetworkSpecifier);
method @Nullable public android.net.NetworkSpecifier redact();
method public abstract boolean satisfiedBy(@Nullable android.net.NetworkSpecifier);
}
public class NetworkStack {
@@ -4776,10 +4775,6 @@ package android.net {
method @NonNull public android.net.StaticIpConfiguration.Builder setIpAddress(@Nullable android.net.LinkAddress);
}
public final class TelephonyNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
method public boolean satisfiedBy(android.net.NetworkSpecifier);
}
public final class TetheredClient implements android.os.Parcelable {
ctor public TetheredClient(@NonNull android.net.MacAddress, @NonNull java.util.Collection<android.net.TetheredClient.AddressInfo>, int);
method public int describeContents();
@@ -5470,10 +5465,6 @@ package android.net.wifi {
field public int numUsage;
}
public final class WifiNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
method public boolean satisfiedBy(android.net.NetworkSpecifier);
}
public class WifiScanner {
method @Deprecated public void configureWifiChange(int, int, int, int, int, android.net.wifi.WifiScanner.BssidInfo[]);
method @Deprecated public void configureWifiChange(android.net.wifi.WifiScanner.WifiChangeSettings);
@@ -5638,10 +5629,6 @@ package android.net.wifi.aware {
method @Deprecated public android.net.NetworkSpecifier createNetworkSpecifierPmk(@NonNull android.net.wifi.aware.PeerHandle, @NonNull byte[]);
}
public final class WifiAwareNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
method public boolean satisfiedBy(android.net.NetworkSpecifier);
}
public static final class WifiAwareNetworkSpecifier.Builder {
method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setPmk(@NonNull byte[]);
}

2
core/java/android/net/NetworkCapabilities.java
View File

@@ -1177,7 +1177,7 @@ public final class NetworkCapabilities implements Parcelable {
}
private boolean satisfiedBySpecifier(NetworkCapabilities nc) {
return mNetworkSpecifier == null || mNetworkSpecifier.satisfiedBy(nc.mNetworkSpecifier)
return mNetworkSpecifier == null || mNetworkSpecifier.canBeSatisfiedBy(nc.mNetworkSpecifier)
|| nc.mNetworkSpecifier instanceof MatchAllNetworkSpecifier;
}

2
core/java/android/net/NetworkRequest.java
View File

@@ -474,7 +474,7 @@ public class NetworkRequest implements Parcelable {
* @param nc Capabilities that should satisfy this NetworkRequest. null capabilities do not
* satisfy any request.
*/
public boolean satisfiedBy(@Nullable NetworkCapabilities nc) {
public boolean canBeSatisfiedBy(@Nullable NetworkCapabilities nc) {
return networkCapabilities.satisfiedByNetworkCapabilities(nc);
}

4
core/java/android/net/NetworkSpecifier.java
View File

@@ -35,7 +35,9 @@ public abstract class NetworkSpecifier {
* @hide
*/
@SystemApi
public abstract boolean satisfiedBy(@Nullable NetworkSpecifier other);
public boolean canBeSatisfiedBy(@Nullable NetworkSpecifier other) {
return false;
}
/**
* Optional method which can be overridden by concrete implementations of NetworkSpecifier to

2
core/java/android/net/StringNetworkSpecifier.java
View File

@@ -40,7 +40,7 @@ public final class StringNetworkSpecifier extends NetworkSpecifier implements Pa
/** @hide */
@Override
public boolean satisfiedBy(NetworkSpecifier other) {
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
return equals(other);
}

2
core/java/android/net/TelephonyNetworkSpecifier.java
View File

@@ -97,7 +97,7 @@ public final class TelephonyNetworkSpecifier extends NetworkSpecifier implements
/** @hide */
@Override
public boolean satisfiedBy(NetworkSpecifier other) {
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
// Any generic requests should be satisfied by a specific telephony network.
// For simplicity, we treat null same as MatchAllNetworkSpecifier
return equals(other) || other == null || other instanceof MatchAllNetworkSpecifier;

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

@@ -2913,7 +2913,7 @@ public class ConnectivityServiceTest {
class ConfidentialMatchAllNetworkSpecifier extends NetworkSpecifier implements
Parcelable {
@Override
public boolean satisfiedBy(NetworkSpecifier other) {
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
return true;
}
@@ -2941,7 +2941,7 @@ public class ConnectivityServiceTest {
}
@Override
public boolean satisfiedBy(NetworkSpecifier other) {
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
if (other instanceof LocalStringNetworkSpecifier) {
return TextUtils.equals(mString,
((LocalStringNetworkSpecifier) other).mString);
@@ -3062,7 +3062,10 @@ public class ConnectivityServiceTest {
});
class NonParcelableSpecifier extends NetworkSpecifier {
public boolean satisfiedBy(NetworkSpecifier other) { return false; }
@Override
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
return false;
}
};
class ParcelableSpecifier extends NonParcelableSpecifier implements Parcelable {
@Override public int describeContents() { return 0; }

2
wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java
View File

@@ -104,7 +104,7 @@ public final class WifiNetworkAgentSpecifier extends NetworkSpecifier implements
}
@Override
public boolean satisfiedBy(@Nullable NetworkSpecifier other) {
public boolean canBeSatisfiedBy(@Nullable NetworkSpecifier other) {
if (this == other) {
return true;
}

2
wifi/java/android/net/wifi/WifiNetworkSpecifier.java
View File

@@ -583,7 +583,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc
/** @hide */
@Override
public boolean satisfiedBy(NetworkSpecifier other) {
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
if (this == other) {
return true;
}

2
wifi/java/android/net/wifi/aware/WifiAwareAgentNetworkSpecifier.java
View File

@@ -121,7 +121,7 @@ public class WifiAwareAgentNetworkSpecifier extends NetworkSpecifier implements
}
@Override
public boolean satisfiedBy(NetworkSpecifier other) {
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
if (!(other instanceof WifiAwareAgentNetworkSpecifier)) {
return false;
}

2
wifi/java/android/net/wifi/aware/WifiAwareNetworkSpecifier.java
View File

@@ -227,7 +227,7 @@ public final class WifiAwareNetworkSpecifier extends NetworkSpecifier implements
/** @hide */
@Override
public boolean satisfiedBy(NetworkSpecifier other) {
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
// MatchAllNetworkSpecifier is taken care in NetworkCapabilities#satisfiedBySpecifier.
if (other instanceof WifiAwareAgentNetworkSpecifier) {
return ((WifiAwareAgentNetworkSpecifier) other).satisfiesAwareNetworkSpecifier(this);

39
wifi/tests/src/android/net/wifi/WifiNetworkAgentSpecifierTest.java
View File

@@ -22,7 +22,6 @@ import static org.junit.Assert.assertTrue;
import android.net.MacAddress;
import android.net.MatchAllNetworkSpecifier;
import android.net.NetworkRequest;
import android.os.Parcel;
import android.os.PatternMatcher;
import android.util.Pair;
@@ -166,8 +165,8 @@ public class WifiNetworkAgentSpecifierTest {
public void testWifiNetworkAgentSpecifierSatisifiesNullAndAllMatch() {
WifiNetworkAgentSpecifier specifier = createDefaultNetworkAgentSpecifier();
assertTrue(specifier.satisfiedBy(null));
assertTrue(specifier.satisfiedBy(new MatchAllNetworkSpecifier()));
assertTrue(specifier.canBeSatisfiedBy(null));
assertTrue(specifier.canBeSatisfiedBy(new MatchAllNetworkSpecifier()));
}
/**
@@ -181,7 +180,7 @@ public class WifiNetworkAgentSpecifierTest {
WifiNetworkAgentSpecifier specifier1 = createDefaultNetworkAgentSpecifier();
WifiNetworkAgentSpecifier specifier2 = createDefaultNetworkAgentSpecifier();
assertTrue(specifier2.satisfiedBy(specifier1));
assertTrue(specifier2.canBeSatisfiedBy(specifier1));
}
/**
@@ -208,8 +207,8 @@ public class WifiNetworkAgentSpecifierTest {
wificonfigurationNetworkSpecifier,
TEST_UID, TEST_PACKAGE);
assertTrue(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
assertTrue(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
assertTrue(wifiNetworkSpecifier.canBeSatisfiedBy(wifiNetworkAgentSpecifier));
assertTrue(wifiNetworkAgentSpecifier.canBeSatisfiedBy(wifiNetworkSpecifier));
}
/**
@@ -237,8 +236,8 @@ public class WifiNetworkAgentSpecifierTest {
wificonfigurationNetworkSpecifier,
TEST_UID, TEST_PACKAGE);
assertTrue(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
assertTrue(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
assertTrue(wifiNetworkSpecifier.canBeSatisfiedBy(wifiNetworkAgentSpecifier));
assertTrue(wifiNetworkAgentSpecifier.canBeSatisfiedBy(wifiNetworkSpecifier));
}
/**
@@ -266,8 +265,8 @@ public class WifiNetworkAgentSpecifierTest {
wificonfigurationNetworkSpecifier,
TEST_UID, TEST_PACKAGE);
assertTrue(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
assertTrue(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
assertTrue(wifiNetworkSpecifier.canBeSatisfiedBy(wifiNetworkAgentSpecifier));
assertTrue(wifiNetworkAgentSpecifier.canBeSatisfiedBy(wifiNetworkSpecifier));
}
/**
@@ -299,8 +298,8 @@ public class WifiNetworkAgentSpecifierTest {
wificonfigurationNetworkSpecifier,
TEST_UID, TEST_PACKAGE);
assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
assertFalse(wifiNetworkSpecifier.canBeSatisfiedBy(wifiNetworkAgentSpecifier));
assertFalse(wifiNetworkAgentSpecifier.canBeSatisfiedBy(wifiNetworkSpecifier));
}
/**
@@ -333,8 +332,8 @@ public class WifiNetworkAgentSpecifierTest {
wificonfigurationNetworkSpecifier,
TEST_UID, TEST_PACKAGE);
assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
assertFalse(wifiNetworkSpecifier.canBeSatisfiedBy(wifiNetworkAgentSpecifier));
assertFalse(wifiNetworkAgentSpecifier.canBeSatisfiedBy(wifiNetworkSpecifier));
}
/**
@@ -367,8 +366,8 @@ public class WifiNetworkAgentSpecifierTest {
wificonfigurationNetworkSpecifier,
TEST_UID, TEST_PACKAGE);
assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
assertFalse(wifiNetworkSpecifier.canBeSatisfiedBy(wifiNetworkAgentSpecifier));
assertFalse(wifiNetworkAgentSpecifier.canBeSatisfiedBy(wifiNetworkSpecifier));
}
/**
@@ -395,8 +394,8 @@ public class WifiNetworkAgentSpecifierTest {
wificonfigurationNetworkSpecifier,
TEST_UID, TEST_PACKAGE);
assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
assertFalse(wifiNetworkSpecifier.canBeSatisfiedBy(wifiNetworkAgentSpecifier));
assertFalse(wifiNetworkAgentSpecifier.canBeSatisfiedBy(wifiNetworkSpecifier));
}
/**
@@ -424,8 +423,8 @@ public class WifiNetworkAgentSpecifierTest {
wificonfigurationNetworkSpecifier,
TEST_UID_1, TEST_PACKAGE_1);
assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
assertFalse(wifiNetworkSpecifier.canBeSatisfiedBy(wifiNetworkAgentSpecifier));
assertFalse(wifiNetworkAgentSpecifier.canBeSatisfiedBy(wifiNetworkSpecifier));
}
private WifiConfiguration createDefaultWifiConfiguration() {

14
wifi/tests/src/android/net/wifi/WifiNetworkSpecifierTest.java
View File

@@ -399,8 +399,8 @@ public class WifiNetworkSpecifierTest {
wifiConfiguration,
TEST_UID, TEST_PACKAGE_NAME);
assertTrue(specifier.satisfiedBy(null));
assertTrue(specifier.satisfiedBy(new MatchAllNetworkSpecifier()));
assertTrue(specifier.canBeSatisfiedBy(null));
assertTrue(specifier.canBeSatisfiedBy(new MatchAllNetworkSpecifier()));
}
/**
@@ -429,7 +429,7 @@ public class WifiNetworkSpecifierTest {
wifiConfiguration,
TEST_UID, TEST_PACKAGE_NAME);
assertTrue(specifier2.satisfiedBy(specifier1));
assertTrue(specifier2.canBeSatisfiedBy(specifier1));
}
/**
@@ -460,7 +460,7 @@ public class WifiNetworkSpecifierTest {
wifiConfiguration2,
TEST_UID, TEST_PACKAGE_NAME);
assertFalse(specifier2.satisfiedBy(specifier1));
assertFalse(specifier2.canBeSatisfiedBy(specifier1));
}
/**
@@ -489,7 +489,7 @@ public class WifiNetworkSpecifierTest {
wifiConfiguration,
TEST_UID, TEST_PACKAGE_NAME);
assertFalse(specifier2.satisfiedBy(specifier1));
assertFalse(specifier2.canBeSatisfiedBy(specifier1));
}
/**
@@ -517,7 +517,7 @@ public class WifiNetworkSpecifierTest {
wifiConfiguration,
TEST_UID, TEST_PACKAGE_NAME);
assertFalse(specifier2.satisfiedBy(specifier1));
assertFalse(specifier2.canBeSatisfiedBy(specifier1));
}
/**
@@ -546,6 +546,6 @@ public class WifiNetworkSpecifierTest {
wifiConfiguration,
TEST_UID, TEST_PACKAGE_NAME + "blah");
assertFalse(specifier2.satisfiedBy(specifier1));
assertFalse(specifier2.canBeSatisfiedBy(specifier1));
}
}

14
wifi/tests/src/android/net/wifi/aware/WifiAwareAgentNetworkSpecifierTest.java
View File

@@ -79,7 +79,7 @@ public class WifiAwareAgentNetworkSpecifierTest {
public void testEmptyDoesntMatchAnything() {
WifiAwareAgentNetworkSpecifier dut = new WifiAwareAgentNetworkSpecifier();
WifiAwareNetworkSpecifier ns = getDummyNetworkSpecifier(6);
collector.checkThat("No match expected", ns.satisfiedBy(dut), equalTo(false));
collector.checkThat("No match expected", ns.canBeSatisfiedBy(dut), equalTo(false));
}
/**
@@ -91,8 +91,8 @@ public class WifiAwareAgentNetworkSpecifierTest {
WifiAwareNetworkSpecifier nsThis = getDummyNetworkSpecifier(6);
WifiAwareAgentNetworkSpecifier dut = new WifiAwareAgentNetworkSpecifier(nsThis);
WifiAwareNetworkSpecifier nsOther = getDummyNetworkSpecifier(8);
collector.checkThat("Match expected", nsThis.satisfiedBy(dut), equalTo(true));
collector.checkThat("No match expected", nsOther.satisfiedBy(dut), equalTo(false));
collector.checkThat("Match expected", nsThis.canBeSatisfiedBy(dut), equalTo(true));
collector.checkThat("No match expected", nsOther.canBeSatisfiedBy(dut), equalTo(false));
}
/**
@@ -113,9 +113,9 @@ public class WifiAwareAgentNetworkSpecifierTest {
WifiAwareNetworkSpecifier nsOther = getDummyNetworkSpecifier(10000);
for (WifiAwareNetworkSpecifier nsThis: nsSet) {
collector.checkThat("Match expected", nsThis.satisfiedBy(dut), equalTo(true));
collector.checkThat("Match expected", nsThis.canBeSatisfiedBy(dut), equalTo(true));
}
collector.checkThat("No match expected", nsOther.satisfiedBy(dut), equalTo(false));
collector.checkThat("No match expected", nsOther.canBeSatisfiedBy(dut), equalTo(false));
}
/**
@@ -137,7 +137,7 @@ public class WifiAwareAgentNetworkSpecifierTest {
WifiAwareAgentNetworkSpecifier newNs = new WifiAwareAgentNetworkSpecifier(
nsSet.toArray(new WifiAwareNetworkSpecifier[nsSet.size()]));
collector.checkThat("Match expected", oldNs.satisfiedBy(newNs), equalTo(true));
collector.checkThat("Match expected", oldNs.canBeSatisfiedBy(newNs), equalTo(true));
}
/**
@@ -159,7 +159,7 @@ public class WifiAwareAgentNetworkSpecifierTest {
WifiAwareAgentNetworkSpecifier oldNs = new WifiAwareAgentNetworkSpecifier(
nsSet.toArray(new WifiAwareNetworkSpecifier[nsSet.size()]));
collector.checkThat("Match unexpected", oldNs.satisfiedBy(newNs), equalTo(false));
collector.checkThat("Match unexpected", oldNs.canBeSatisfiedBy(newNs), equalTo(false));
}
// utilities