joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
am: 62e4efeee2

Change-Id: Ic164c4a29cd449a31b2f1c12c8c345bcc5dc77fa
This commit is contained in:
Pavel Maltsev 2018-03-30 18:30:23 +00:00 • committed by android-build-merger
commit 518c3decff
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/java/android/net/NetworkCapabilities.java
View file

@ -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 @@ public final class NetworkCapabilities implements Parcelable {
* 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;