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

Commit ca46c6be authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Let tests enumerate all transports/capabilities." into pi-dev am: 8e6445a1 

am: 75299cff

Change-Id: If07e77c92046807235229a4f67ee087bdd7bccf1
parents 7e3ac715 75299cff

api/test-current.txt

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

    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 {

  public class TrafficStats {

    method public static long getLoopbackRxBytes();

    method public static long getLoopbackRxBytes();

    method public static long getLoopbackRxPackets();

    method public static long getLoopbackRxPackets();

config/hiddenapi-light-greylist.txt

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

Landroid/net/NetworkCapabilities;-><init>()V

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

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

Landroid/net/NetworkCapabilities;->addTransportType(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;->mNetworkCapabilities:J

Landroid/net/NetworkCapabilities;->mSignalStrength:I

Landroid/net/NetworkCapabilities;->mSignalStrength:I

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

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

core/java/android/net/NetworkCapabilities.java

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




import android.annotation.IntDef;

import android.annotation.IntDef;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.net.ConnectivityManager.NetworkCallback;

import android.net.ConnectivityManager.NetworkCallback;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

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

     * @return an array of capability values for this instance.

     * @hide

     * @hide

     */

     */

    @TestApi

    public @NetCapability int[] getCapabilities() {

    public @NetCapability int[] getCapabilities() {

        return BitUtils.unpackBits(mNetworkCapabilities);

        return BitUtils.unpackBits(mNetworkCapabilities);

    }

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

     * @return an array of transport type values for this instance.

     * @hide

     * @hide

     */

     */

    @TestApi

    public @Transport int[] getTransportTypes() {

    public @Transport int[] getTransportTypes() {

        return BitUtils.unpackBits(mTransportTypes);

        return BitUtils.unpackBits(mTransportTypes);

    }

    }