LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Move some members to the "Q blacklist"."

Browse Source
This commit is contained in:
Nathan Harold
2018-10-23 21:53:51 +00:00
committed by Gerrit Code Review
parent e302f75920 0e71d36c58
commit 26f91069c1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ import android.annotation.SystemApi;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.net.ConnectivityManager.NetworkCallback; import android.net.ConnectivityManager.NetworkCallback;
import android.os.Build;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.util.ArraySet; import android.util.ArraySet;
@@ -904,7 +905,7 @@ public final class NetworkCapabilities implements Parcelable {
* specifier. See {@link #setNetworkSpecifier}. * specifier. See {@link #setNetworkSpecifier}.
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
public NetworkSpecifier getNetworkSpecifier() { public NetworkSpecifier getNetworkSpecifier() {
return mNetworkSpecifier; return mNetworkSpecifier;
} }

3
core/java/android/net/NetworkState.java
View File

@@ -17,6 +17,7 @@
package android.net; package android.net;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.os.Build;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.util.Slog; import android.util.Slog;
@@ -34,7 +35,7 @@ public class NetworkState implements Parcelable {
public final NetworkInfo networkInfo; public final NetworkInfo networkInfo;
public final LinkProperties linkProperties; public final LinkProperties linkProperties;
public final NetworkCapabilities networkCapabilities; public final NetworkCapabilities networkCapabilities;
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
public final Network network; public final Network network;
public final String subscriberId; public final String subscriberId;
public final String networkId; public final String networkId;