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

Merge "Revert "Annotate StringNetworkSpecifier @Deprecated and @removed"" am: 1413b254eb am: dd2a5c7c69

Browse Source 
Change-Id: Ia4912e6328ee83b0d8ecaf7f97833c180f7d3055
This commit is contained in:
Automerger Merge Worker
2020-01-18 20:44:05 +00:00
parent eb368aed7f dd2a5c7c69
commit 6011b4e780
3 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/system-current.txt
View File

@@ -4641,6 +4641,15 @@ package android.net {
method @NonNull public android.net.StaticIpConfiguration.Builder setIpAddress(@Nullable android.net.LinkAddress);
}
public final class StringNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
ctor public StringNetworkSpecifier(@NonNull String);
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.StringNetworkSpecifier> CREATOR;
field @NonNull public final String specifier;
}
public final class TelephonyNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
method public boolean satisfiedBy(android.net.NetworkSpecifier);
}

12
api/system-removed.txt
View File

@@ -130,18 +130,6 @@ package android.media.tv {
}
package android.net {
@Deprecated public final class StringNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
ctor public StringNetworkSpecifier(@NonNull String);
method public int describeContents();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.StringNetworkSpecifier> CREATOR;
field @NonNull public final String specifier;
}
}
package android.net.wifi {
@Deprecated public class BatchedScanResult implements android.os.Parcelable {

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

@@ -26,16 +26,7 @@ import com.android.internal.util.Preconditions;
import java.util.Objects;
/**
* @deprecated use other subclass of {@link android.net.NetworkSpecifier},
* eg. {@link android.net.TelephonyNetworkSpecifier},
* {@link android.net.wifi.WifiNetworkSpecifier} instead.
* @see {@link android.net.NetworkRequest#setNetworkSpecifier(String)} for details.
* @removed this class was tentatively made SystemApi in December 2019 in the scramble for
* publishing mainline APIs, it should be removed before R release is published.
* @hide
*/
@Deprecated
/** @hide */
@SystemApi
public final class StringNetworkSpecifier extends NetworkSpecifier implements Parcelable {
/**