Merge "Support to query TYPE_WIFI usage with subscriberId" am: d8a067cd9e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608057 Change-Id: I753603201bd935af055cf25135e4f8faf436bf2a
2021-05-18 13:35:08 +00:00
parent 937568499f d8a067cd9e
commit 72baf5dab7
1 changed files with 4 additions and 1 deletions
--- a/core/java/android/app/usage/NetworkStatsManager.java
+++ b/core/java/android/app/usage/NetworkStatsManager.java
@@ -644,7 +644,10 @@ public class NetworkStatsManager {
                        : NetworkTemplate.buildTemplateMobileAll(subscriberId);
                break;
            case ConnectivityManager.TYPE_WIFI:
-                template = NetworkTemplate.buildTemplateWifiWildcard();
+                template = subscriberId == null
+                        ? NetworkTemplate.buildTemplateWifiWildcard()
+                        : NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
+                                subscriberId);
                break;
            default:
                throw new IllegalArgumentException("Cannot create template for network type "