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

Commit 0230db03 authored by Pavel Maltsev's avatar Pavel Maltsev Committed by android-build-merger
Browse files

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

am: 8982a81f

Change-Id: Ic164c4a29cd449a31b2f1c12c8c345bcc5dc77fa
parents 7121e047 8982a81f

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -3105,6 +3105,10 @@ package android.net { 
    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

+2 −0
Original line number Diff line number Diff line
@@ -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;