Merge "Add OEM_PAID capability to system api" into pi-dev

This commit is contained in:
Pavel Maltsev
2018-03-30 16:32:52 +00:00
committed by Android (Google) Code Review

View File

@@ -17,6 +17,7 @@
package android.net; package android.net;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.SystemApi;
import android.net.ConnectivityManager.NetworkCallback; import android.net.ConnectivityManager.NetworkCallback;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@@ -276,6 +277,7 @@ public final class NetworkCapabilities implements Parcelable {
* this network can be used by system apps to upload telemetry data. * this network can be used by system apps to upload telemetry data.
* @hide * @hide
*/ */
@SystemApi
public static final int NET_CAPABILITY_OEM_PAID = 22; public static final int NET_CAPABILITY_OEM_PAID = 22;
private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS; private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS;