diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2020-01-08 10:24:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-08 10:24:56 +0000 |
| commit | ba9707e90d6dc11e9ee1c54ad31f4e83c3e9fef2 (patch) | |
| tree | cfb5d7d511d8f9f95a958a1d3d5234662a98d9bb /core/java/android | |
| parent | 3562952f8369e496b412c73f8a0b86b0ffd5cf1a (diff) | |
| parent | b7af420f03e5987f40783c29f93e624ced4daa5a (diff) | |
Merge "Expose NetworkSpecifier methods as SystemApi"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/NetworkSpecifier.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/net/NetworkSpecifier.java b/core/java/android/net/NetworkSpecifier.java index 2bc3eb56ec2d..cf31d217c967 100644 --- a/core/java/android/net/NetworkSpecifier.java +++ b/core/java/android/net/NetworkSpecifier.java @@ -16,6 +16,9 @@ package android.net; +import android.annotation.Nullable; +import android.annotation.SystemApi; + /** * Describes specific properties of a requested network for use in a {@link NetworkRequest}. * @@ -31,7 +34,8 @@ public abstract class NetworkSpecifier { * * @hide */ - public abstract boolean satisfiedBy(NetworkSpecifier other); + @SystemApi + public abstract boolean satisfiedBy(@Nullable NetworkSpecifier other); /** * Optional method which can be overridden by concrete implementations of NetworkSpecifier to @@ -45,6 +49,7 @@ public abstract class NetworkSpecifier { * * @hide */ + @SystemApi public void assertValidFromUid(int requestorUid) { // empty } @@ -68,6 +73,8 @@ public abstract class NetworkSpecifier { * * @hide */ + @SystemApi + @Nullable public NetworkSpecifier redact() { // TODO (b/122160111): convert default to null once all platform NetworkSpecifiers // implement this method. |