Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev

2021-05-20 08:55:59 +00:00
parent 255253242f ee39c8deec
commit aca6568d23
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 "