Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 922b9d38 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove StringNetworkSpecifier" am: bdbc3e7e am: fa25f2f3 am: ec06afee 

Change-Id: I60c9e49085701e05bddbed6a8735e6973e9f2986
parents 81e95986 ec06afee

api/system-current.txt

+0 −9
Original line number Diff line number Diff line
@@ -6437,15 +6437,6 @@ 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);















  }

































core/java/android/net/StringNetworkSpecifier.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -17,7 +17,6 @@













package android.net;































import android.annotation.NonNull;













import android.annotation.SystemApi;















import android.os.Parcel;















import android.os.Parcelable;















import android.text.TextUtils;









@@ -27,7 +26,6 @@ import com.android.internal.util.Preconditions;













import java.util.Objects;































/** @hide */













@SystemApi















public final class StringNetworkSpecifier extends NetworkSpecifier implements Parcelable {















    /**















     * Arbitrary string used to pass (additional) information to the network factory.