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

Commit e19b33e0 authored by Pavel Maltsev's avatar Pavel Maltsev Committed by Chalard Jean
Browse files

Add OEM_PAID capability to system api 

Some system apps should be able to request OEM_PAID networks.  This
makes a lot of sense when Android is used as in-vehicle infotainment
systems.

Clean cherry-pick of ag/3782591

Bug: 68762530
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: I306f060c5a386ff4b82cd99a03dc037ce60ded6a
Merged-In: Ic164c4a29cd449a31b2f1c12c8c345bcc5dc77fa
Merged-In: I6e9c4130db23a4f1c89ce7e9071ae519a2b0b7ec
parent 2b24f8cf

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -2636,6 +2636,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;
@@ -275,6 +276,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;