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

Commit f49cbec8 authored by Antonio Cansado's avatar Antonio Cansado Committed by android-build-merger
Browse files

Merge "Cleaning up NetworkStatsManager." into nyc-dev 

am: c45f0aea

* commit 'c45f0aea':
  Cleaning up NetworkStatsManager.

Change-Id: Id556eb00f5183a2f6905020f24f5d3f5f8d02795
parents 1a6f583c c45f0aea

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6457,7 +6457,7 @@ package android.app.usage { 
  public class NetworkStatsManager {

    method public android.app.usage.NetworkStats queryDetails(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;

    method public android.app.usage.NetworkStats queryDetailsForUid(int, java.lang.String, long, long, int) throws android.os.RemoteException, java.lang.SecurityException;

    method public android.app.usage.NetworkStats queryDetailsForUidTag(int, java.lang.String, long, long, int, int);

    method public android.app.usage.NetworkStats queryDetailsForUidTag(int, java.lang.String, long, long, int, int) throws java.lang.SecurityException;

    method public android.app.usage.NetworkStats querySummary(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;

    method public android.app.usage.NetworkStats.Bucket querySummaryForDevice(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;

    method public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;

api/removed.txt

+0 −31
Original line number Diff line number Diff line
@@ -31,37 +31,6 @@ package android.app.admin { 


}



package android.app.usage {



  public class DataUsagePolicy {

    field public final int networkType;

    field public final java.lang.String[] subscriberIds;

    field public final long thresholdInBytes;

    field public final int[] uids;

  }



  public static class DataUsagePolicy.Builder {

    ctor public DataUsagePolicy.Builder();

    method public android.app.usage.DataUsagePolicy.Builder addSubscriberId(java.lang.String);

    method public android.app.usage.DataUsagePolicy.Builder addUid(int);

    method public android.app.usage.DataUsagePolicy build();

    method public android.app.usage.DataUsagePolicy.Builder setNetworkType(int);

    method public android.app.usage.DataUsagePolicy.Builder setThreshold(long);

  }



  public class NetworkStatsManager {

    method public void registerDataUsageCallback(android.app.usage.DataUsagePolicy, android.app.usage.NetworkStatsManager.DataUsageCallback, android.os.Handler);

    method public void registerDataUsageCallback(android.app.usage.DataUsagePolicy, android.app.usage.NetworkStatsManager.UsageCallback, android.os.Handler);

    method public void unregisterDataUsageCallback(android.app.usage.NetworkStatsManager.DataUsageCallback);

  }



  public static abstract class NetworkStatsManager.DataUsageCallback {

    ctor public NetworkStatsManager.DataUsageCallback();

    method public deprecated void onLimitReached();

  }



}



package android.content {



  public abstract class Context {

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6738,7 +6738,7 @@ package android.app.usage { 
  public class NetworkStatsManager {

    method public android.app.usage.NetworkStats queryDetails(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;

    method public android.app.usage.NetworkStats queryDetailsForUid(int, java.lang.String, long, long, int) throws android.os.RemoteException, java.lang.SecurityException;

    method public android.app.usage.NetworkStats queryDetailsForUidTag(int, java.lang.String, long, long, int, int);

    method public android.app.usage.NetworkStats queryDetailsForUidTag(int, java.lang.String, long, long, int, int) throws java.lang.SecurityException;

    method public android.app.usage.NetworkStats querySummary(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;

    method public android.app.usage.NetworkStats.Bucket querySummaryForDevice(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;

    method public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;

api/system-removed.txt

+0 −31
Original line number Diff line number Diff line
@@ -29,37 +29,6 @@ package android.app.admin { 


}



package android.app.usage {



  public class DataUsagePolicy {

    field public final int networkType;

    field public final java.lang.String[] subscriberIds;

    field public final long thresholdInBytes;

    field public final int[] uids;

  }



  public static class DataUsagePolicy.Builder {

    ctor public DataUsagePolicy.Builder();

    method public android.app.usage.DataUsagePolicy.Builder addSubscriberId(java.lang.String);

    method public android.app.usage.DataUsagePolicy.Builder addUid(int);

    method public android.app.usage.DataUsagePolicy build();

    method public android.app.usage.DataUsagePolicy.Builder setNetworkType(int);

    method public android.app.usage.DataUsagePolicy.Builder setThreshold(long);

  }



  public class NetworkStatsManager {

    method public void registerDataUsageCallback(android.app.usage.DataUsagePolicy, android.app.usage.NetworkStatsManager.DataUsageCallback, android.os.Handler);

    method public void registerDataUsageCallback(android.app.usage.DataUsagePolicy, android.app.usage.NetworkStatsManager.UsageCallback, android.os.Handler);

    method public void unregisterDataUsageCallback(android.app.usage.NetworkStatsManager.DataUsageCallback);

  }



  public static abstract class NetworkStatsManager.DataUsageCallback {

    ctor public NetworkStatsManager.DataUsageCallback();

    method public deprecated void onLimitReached();

  }



}



package android.content {



  public abstract class Context {

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6463,7 +6463,7 @@ package android.app.usage { 
  public class NetworkStatsManager {

    method public android.app.usage.NetworkStats queryDetails(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;

    method public android.app.usage.NetworkStats queryDetailsForUid(int, java.lang.String, long, long, int) throws android.os.RemoteException, java.lang.SecurityException;

    method public android.app.usage.NetworkStats queryDetailsForUidTag(int, java.lang.String, long, long, int, int);

    method public android.app.usage.NetworkStats queryDetailsForUidTag(int, java.lang.String, long, long, int, int) throws java.lang.SecurityException;

    method public android.app.usage.NetworkStats querySummary(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;

    method public android.app.usage.NetworkStats.Bucket querySummaryForDevice(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;

    method public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;