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

Commit a5ee62f3 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Let tests enumerate all transports/capabilities. 

This gives them a way to collect all included values without
resorting to manual probing of each newly added value.

Bug: 16207332
Test: atest com.android.cts.net.HostsideVpnTests
Change-Id: I35ca412512dc8515b44d5518e1ca4caa5bdc678f
parent 869c6f55

api/test-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -564,6 +564,11 @@ package android.net { 
    field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0

  }



  public final class NetworkCapabilities implements android.os.Parcelable {

    method public int[] getCapabilities();

    method public int[] getTransportTypes();

  }



  public class TrafficStats {

    method public static long getLoopbackRxBytes();

    method public static long getLoopbackRxPackets();

config/hiddenapi-light-greylist.txt

+0 −2
Original line number Diff line number Diff line
@@ -3208,8 +3208,6 @@ Landroid/net/NetworkAgent;->sendNetworkInfo(Landroid/net/NetworkInfo;)V 
Landroid/net/NetworkCapabilities;-><init>()V

Landroid/net/NetworkCapabilities;->addCapability(I)Landroid/net/NetworkCapabilities;

Landroid/net/NetworkCapabilities;->addTransportType(I)Landroid/net/NetworkCapabilities;

Landroid/net/NetworkCapabilities;->getCapabilities()[I

Landroid/net/NetworkCapabilities;->getTransportTypes()[I

Landroid/net/NetworkCapabilities;->mNetworkCapabilities:J

Landroid/net/NetworkCapabilities;->mSignalStrength:I

Landroid/net/NetworkCapabilities;->removeCapability(I)Landroid/net/NetworkCapabilities;

core/java/android/net/NetworkCapabilities.java

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.net; 


import android.annotation.IntDef;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.net.ConnectivityManager.NetworkCallback;

import android.os.Parcel;

import android.os.Parcelable;
@@ -427,6 +428,7 @@ public final class NetworkCapabilities implements Parcelable { 
     * @return an array of capability values for this instance.

     * @hide

     */

    @TestApi

    public @NetCapability int[] getCapabilities() {

        return BitUtils.unpackBits(mNetworkCapabilities);

    }
@@ -690,6 +692,7 @@ public final class NetworkCapabilities implements Parcelable { 
     * @return an array of transport type values for this instance.

     * @hide

     */

    @TestApi

    public @Transport int[] getTransportTypes() {

        return BitUtils.unpackBits(mTransportTypes);

    }