diff options
| author | Aaron Huang <huangaaron@google.com> | 2019-12-19 14:51:15 +0800 |
|---|---|---|
| committer | Aaron Huang <huangaaron@google.com> | 2019-12-19 14:51:15 +0800 |
| commit | adfdf4da4f2770b7dc06c5b2ab1071dba2c9e77d (patch) | |
| tree | a80f4ba9c3d767462ebf61827300a108e130bcac /core/java | |
| parent | be64b53449fbe521650669f38e7d7342a5c7ecad (diff) | |
Make MatchAllNetworkSpecifier constructor @SystemApi
Bug: 135998869
Bug: 138306002
Test: atest FrameworksNetTests
atest FrameworksTelephonyTests
./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ifcd9ad2916c696c99b8fa13632a302d67f4cb58c
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/MatchAllNetworkSpecifier.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/java/android/net/MatchAllNetworkSpecifier.java b/core/java/android/net/MatchAllNetworkSpecifier.java index ab4f627a291b..68a39355198b 100644 --- a/core/java/android/net/MatchAllNetworkSpecifier.java +++ b/core/java/android/net/MatchAllNetworkSpecifier.java @@ -16,6 +16,8 @@ package android.net; +import android.annotation.NonNull; +import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -27,10 +29,12 @@ import android.os.Parcelable; * * @hide */ +@SystemApi public final class MatchAllNetworkSpecifier extends NetworkSpecifier implements Parcelable { /** * Utility method which verifies that the ns argument is not a MatchAllNetworkSpecifier and * throws an IllegalArgumentException if it is. + * @hide */ public static void checkNotMatchAllNetworkSpecifier(NetworkSpecifier ns) { if (ns instanceof MatchAllNetworkSpecifier) { @@ -38,6 +42,7 @@ public final class MatchAllNetworkSpecifier extends NetworkSpecifier implements } } + /** @hide */ public boolean satisfiedBy(NetworkSpecifier other) { /* * The method is called by a NetworkRequest to see if it is satisfied by a proposed @@ -64,11 +69,11 @@ public final class MatchAllNetworkSpecifier extends NetworkSpecifier implements } @Override - public void writeToParcel(Parcel dest, int flags) { + public void writeToParcel(@NonNull Parcel dest, int flags) { // Nothing to write. } - public static final @android.annotation.NonNull Parcelable.Creator<MatchAllNetworkSpecifier> CREATOR = + public static final @NonNull Parcelable.Creator<MatchAllNetworkSpecifier> CREATOR = new Parcelable.Creator<MatchAllNetworkSpecifier>() { public MatchAllNetworkSpecifier createFromParcel(Parcel in) { return new MatchAllNetworkSpecifier(); |
