commit 8982a81f3c63a9e08c693e503d75db46ce9c19eb
author Pavel Maltsev <pavelm@google.com> Fri Mar 30 16:32:52 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 30 16:32:52 2018 +0000
tree db4233c41e54bd2f639406992e0e8ce757620642
parent e6b1a7804d962d06263329792b8b65050ad45d91
parent d9c9fff1399e09ae49c6cd6e131d884e9e0bc96e

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

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index ed763ba..1284de88 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -3105,6 +3105,10 @@
     field public static final int ERROR_INVALID_NETWORK = 1; // 0x1
   }
 
+  public final class NetworkCapabilities implements android.os.Parcelable {
+    field public static final int NET_CAPABILITY_OEM_PAID = 22; // 0x16
+  }
+
   public class NetworkKey implements android.os.Parcelable {
     ctor public NetworkKey(android.net.WifiKey);
     method public int describeContents();

core/java/android/net/NetworkCapabilities.java

diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index ff5714b..374b3ab 100644
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -17,6 +17,7 @@
 package android.net;
 
 import android.annotation.IntDef;
+import android.annotation.SystemApi;
 import android.net.ConnectivityManager.NetworkCallback;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -276,6 +277,7 @@
      * this network can be used by system apps to upload telemetry data.
      * @hide
      */
+    @SystemApi
     public static final int NET_CAPABILITY_OEM_PAID = 22;
 
     private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS;