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

Commit e0ee61ea authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

[MS45] Expose SystemApis to query summary and history with template am: 685a738d 

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

Change-Id: If04320bcfe487352e6a15f7a9dc9e168ce6ff899
parents ec3b9108 685a738d

core/api/module-lib-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -56,6 +56,11 @@ package android.app.usage { 
  public class NetworkStatsManager {

    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void forceUpdate();

    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void notifyNetworkStatus(@NonNull java.util.List<android.net.Network>, @NonNull java.util.List<android.net.NetworkStateSnapshot>, @Nullable String, @NonNull java.util.List<android.net.UnderlyingNetworkInfo>);

    method @NonNull @WorkerThread public android.app.usage.NetworkStats queryDetailsForDevice(@NonNull android.net.NetworkTemplate, long, long);

    method @NonNull @WorkerThread public android.app.usage.NetworkStats queryDetailsForUidTagState(@NonNull android.net.NetworkTemplate, long, long, int, int, int) throws java.lang.SecurityException;

    method @NonNull @WorkerThread public android.app.usage.NetworkStats querySummary(@NonNull android.net.NetworkTemplate, long, long) throws java.lang.SecurityException;

    method @NonNull @WorkerThread public android.app.usage.NetworkStats.Bucket querySummaryForDevice(@NonNull android.net.NetworkTemplate, long, long);

    method @NonNull @WorkerThread public android.app.usage.NetworkStats queryTaggedSummary(@NonNull android.net.NetworkTemplate, long, long) throws java.lang.SecurityException;

    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void setDefaultGlobalAlert(long);

    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void setPollOnOpen(boolean);

    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void setStatsProviderWarningAndLimitAsync(@NonNull String, long, long);

packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java

+10 −5
Original line number Diff line number Diff line
@@ -211,9 +211,10 @@ public class NetworkStatsManager { 
     */

    @NonNull

    @WorkerThread

    // @SystemApi(client = MODULE_LIBRARIES)

    @SystemApi(client = MODULE_LIBRARIES)

    public Bucket querySummaryForDevice(@NonNull NetworkTemplate template,

            long startTime, long endTime) {

        Objects.requireNonNull(template);

        try {

            NetworkStats stats =

                    new NetworkStats(mContext, template, mFlags, startTime, endTime, mService);
@@ -385,10 +386,11 @@ public class NetworkStatsManager { 
     * @hide

     */

    @NonNull

    // @SystemApi(client = MODULE_LIBRARIES)

    @SystemApi(client = MODULE_LIBRARIES)

    @WorkerThread

    public NetworkStats querySummary(@NonNull NetworkTemplate template, long startTime,

            long endTime) throws SecurityException {

        Objects.requireNonNull(template);

        try {

            NetworkStats result =

                    new NetworkStats(mContext, template, mFlags, startTime, endTime, mService);
@@ -418,10 +420,11 @@ public class NetworkStatsManager { 
     * @hide

     */

    @NonNull

    // @SystemApi(client = MODULE_LIBRARIES)

    @SystemApi(client = MODULE_LIBRARIES)

    @WorkerThread

    public NetworkStats queryTaggedSummary(@NonNull NetworkTemplate template, long startTime,

            long endTime) throws SecurityException {

        Objects.requireNonNull(template);

        try {

            NetworkStats result =

                    new NetworkStats(mContext, template, mFlags, startTime, endTime, mService);
@@ -453,10 +456,11 @@ public class NetworkStatsManager { 
     * @hide

     */

    @NonNull

    // @SystemApi(client = MODULE_LIBRARIES)

    @SystemApi(client = MODULE_LIBRARIES)

    @WorkerThread

    public NetworkStats queryDetailsForDevice(@NonNull NetworkTemplate template,

            long startTime, long endTime) {

        Objects.requireNonNull(template);

        try {

            final NetworkStats result =

                    new NetworkStats(mContext, template, mFlags, startTime, endTime, mService);
@@ -580,10 +584,11 @@ public class NetworkStatsManager { 
     * @hide

     */

    @NonNull

    // @SystemApi(client = MODULE_LIBRARIES)

    @SystemApi(client = MODULE_LIBRARIES)

    @WorkerThread

    public NetworkStats queryDetailsForUidTagState(@NonNull NetworkTemplate template,

            long startTime, long endTime, int uid, int tag, int state) throws SecurityException {

        Objects.requireNonNull(template);

        try {

            final NetworkStats result = new NetworkStats(

                    mContext, template, mFlags, startTime, endTime, mService);