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

Commit b3ebae14 authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Add NWM#getWatchlistConfigHash to test api for testing" am: e87f10b9 am: 4d4af2bd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675628

Change-Id: I5c23c18244f3de52f0a998eb13f33932a85d1bd1
parents 4911a46b 4d4af2bd

core/api/test-current.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -1009,6 +1009,10 @@ package android.net { 
    method public static void setServiceForTest(@Nullable android.os.IBinder);

    method public static void setServiceForTest(@Nullable android.os.IBinder);

  }

  }





  public class NetworkWatchlistManager {

    method @Nullable public byte[] getWatchlistConfigHash();

  }



  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();

core/java/android/net/NetworkWatchlistManager.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package android.net; 
import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.content.Context;

import android.content.Context;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.ServiceManager;
@@ -31,6 +32,7 @@ import com.android.internal.util.Preconditions; 
 * Class that manage network watchlist in system.

 * Class that manage network watchlist in system.

 * @hide

 * @hide

 */

 */

@TestApi

@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

@SystemService(Context.NETWORK_WATCHLIST_SERVICE)

@SystemService(Context.NETWORK_WATCHLIST_SERVICE)

public class NetworkWatchlistManager {

public class NetworkWatchlistManager {