| commit | 722aab020824d9367704b4af4c20f95062f1fb55 | [log] [tgz] |
|---|---|---|
| author | Les Lee <lesl@google.com> | Tue May 18 13:35:08 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 18 13:35:08 2021 +0000 |
| tree | 3e4e4e5025f2e838db32a98fc2eac8f2df492a6f | |
| parent | 9366d34196266dee974b9899d5bcb11546244785 [diff] | |
| parent | 15672a8a12133fe193c714f822419562d1d1b04e [diff] |
Merge "Support to query TYPE_WIFI usage with subscriberId" am: 15672a8a12 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608057 Change-Id: I753603201bd935af055cf25135e4f8faf436bf2a
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 "