commit d8a067cd9e150009db7c88b64e409534aa0009e0
author Les Lee <lesl@google.com> Tue May 18 13:02:07 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 18 13:02:07 2021 +0000
tree 3e4e4e5025f2e838db32a98fc2eac8f2df492a6f
parent 7486607f4b19f445ac1da3b3cc6144d981d44a6c
parent 9528b8b4528d4f93f90c4ce1c1e03797dc38b9e8

Merge "Support to query TYPE_WIFI usage with subscriberId"

core/java/android/app/usage/NetworkStatsManager.java

diff --git a/core/java/android/app/usage/NetworkStatsManager.java b/core/java/android/app/usage/NetworkStatsManager.java
index 6cb4b5e..fe99f85 100644
--- a/core/java/android/app/usage/NetworkStatsManager.java
+++ b/core/java/android/app/usage/NetworkStatsManager.java
@@ -644,7 +644,10 @@
                         : 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 "