SystemUI: Implement Wi-Fi Daily data usage

also cleanup DataUsageController code while at it.

Signed-off-by: Jyotiraditya Panda <jyotiraditya@aospa.co>
Signed-off-by: Genkzsz11 <Genkzsz11@gmail.com>

Author: imjyotiraditya

packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java

@@ -28,13 +28,12 @@
 import android.app.usage.NetworkStatsManager;
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.net.INetworkStatsService;
-import android.net.INetworkStatsSession;
 import android.net.NetworkPolicy;
 import android.net.NetworkPolicyManager;
 import android.net.NetworkTemplate;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
 import android.os.RemoteException;
-import android.os.ServiceManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.format.DateUtils;
@@ -60,22 +59,20 @@ public class DataUsageController {
 
     private final Context mContext;
     private final ConnectivityManager mConnectivityManager;
-    private final INetworkStatsService mStatsService;
     private final NetworkPolicyManager mPolicyManager;
     private final NetworkStatsManager mNetworkStatsManager;
+    private final WifiManager mWifiManager;
 
-    private INetworkStatsSession mSession;
     private Callback mCallback;
     private NetworkNameProvider mNetworkController;
     private int mSubscriptionId;
 
     public DataUsageController(Context context) {
         mContext = context;
         mConnectivityManager = ConnectivityManager.from(context);
-        mStatsService = INetworkStatsService.Stub.asInterface(
-                ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
         mPolicyManager = NetworkPolicyManager.from(mContext);
         mNetworkStatsManager = context.getSystemService(NetworkStatsManager.class);
+        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
         mSubscriptionId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
     }
 
@@ -111,19 +108,28 @@ private DataUsageInfo warn(String msg) {
 
     public DataUsageInfo getDataUsageInfo() {
         NetworkTemplate template = DataUsageUtils.getMobileTemplate(mContext, mSubscriptionId);
-
         return getDataUsageInfo(template);
     }
 
     public DataUsageInfo getDailyDataUsageInfo() {
         NetworkTemplate template = DataUsageUtils.getMobileTemplate(mContext, mSubscriptionId);
-
         return getDailyDataUsageInfo(template);
     }
 
     public DataUsageInfo getWifiDataUsageInfo() {
-        NetworkTemplate template = NetworkTemplate.buildTemplateWifiWildcard();
-        return getDataUsageInfo(template);
+        return getDataUsageInfo(getWifiNetworkTemplate());
+    }
+
+    public DataUsageInfo getWifiDailyDataUsageInfo() {
+        return getDailyDataUsageInfo(getWifiNetworkTemplate());
+    }
+
+    public NetworkTemplate getWifiNetworkTemplate() {
+        final WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
+        if (wifiInfo.getHiddenSSID() || wifiInfo.getSSID().equals(WifiManager.UNKNOWN_SSID)) {
+            return NetworkTemplate.buildTemplateWifiWildcard();
+        }
+        return NetworkTemplate.buildTemplateWifi(wifiInfo.getSSID());
     }
 
     public DataUsageInfo getDataUsageInfo(NetworkTemplate template) {
@@ -193,6 +199,7 @@ public DataUsageInfo getDailyDataUsageInfo(NetworkTemplate template) {
 
     /**
      * Get the total usage level recorded in the network history
+     *
      * @param template the network template to retrieve the network history
      * @return the total usage level recorded in the network history or -1L if there is error
      * retrieving the data.
@@ -219,8 +226,7 @@ private NetworkPolicy findNetworkPolicy(NetworkTemplate template) {
         final NetworkPolicy[] policies = mPolicyManager.getNetworkPolicies();
         if (policies == null) return null;
         final int N = policies.length;
-        for (int i = 0; i < N; i++) {
-            final NetworkPolicy policy = policies[i];
+        for (final NetworkPolicy policy : policies) {
             if (policy != null && template.equals(policy.template)) {
                 return policy;
             }
@@ -229,14 +235,14 @@ private NetworkPolicy findNetworkPolicy(NetworkTemplate template) {
     }
 
     private static String statsBucketToString(Bucket bucket) {
-        return bucket == null ? null : new StringBuilder("Entry[")
-            .append("bucketDuration=").append(bucket.getEndTimeStamp() - bucket.getStartTimeStamp())
-            .append(",bucketStart=").append(bucket.getStartTimeStamp())
-            .append(",rxBytes=").append(bucket.getRxBytes())
-            .append(",rxPackets=").append(bucket.getRxPackets())
-            .append(",txBytes=").append(bucket.getTxBytes())
-            .append(",txPackets=").append(bucket.getTxPackets())
-            .append(']').toString();
+        return bucket == null ? null : "Entry[" +
+                "bucketDuration=" + (bucket.getEndTimeStamp() - bucket.getStartTimeStamp()) +
+                ",bucketStart=" + bucket.getStartTimeStamp() +
+                ",rxBytes=" + bucket.getRxBytes() +
+                ",rxPackets=" + bucket.getRxPackets() +
+                ",txBytes=" + bucket.getTxBytes() +
+                ",txPackets=" + bucket.getTxPackets() +
+                ']';
     }
 
     @VisibleForTesting
@@ -284,22 +290,20 @@ static int getNetworkType(NetworkTemplate networkTemplate) {
         }
         final int matchRule = networkTemplate.getMatchRule();
         switch (matchRule) {
-            case NetworkTemplate.MATCH_MOBILE:
-            case NetworkTemplate.MATCH_MOBILE_WILDCARD:
-                return ConnectivityManager.TYPE_MOBILE;
             case NetworkTemplate.MATCH_WIFI:
             case NetworkTemplate.MATCH_WIFI_WILDCARD:
-                return  ConnectivityManager.TYPE_WIFI;
+                return ConnectivityManager.TYPE_WIFI;
             case NetworkTemplate.MATCH_ETHERNET:
-                return  ConnectivityManager.TYPE_ETHERNET;
+                return ConnectivityManager.TYPE_ETHERNET;
+            case NetworkTemplate.MATCH_MOBILE:
+            case NetworkTemplate.MATCH_MOBILE_WILDCARD:
             default:
                 return ConnectivityManager.TYPE_MOBILE;
         }
     }
 
     private String getActiveSubscriberId() {
-        final String actualSubscriberId = getTelephonyManager().getSubscriberId();
-        return actualSubscriberId;
+        return getTelephonyManager().getSubscriberId();
     }
 
     private String formatDateRange(long start, long end) {

packages/SystemUI/src/com/android/systemui/statusbar/DataUsageView.java

@@ -5,9 +5,6 @@
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkCapabilities;
-import android.net.NetworkTemplate;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
 import android.provider.Settings;
 import android.telephony.SubscriptionInfo;
@@ -31,15 +28,13 @@ public class DataUsageView extends TextView {
     private static boolean shouldUpdateDataTextView;
     private ConnectivityManager mConnectivityManager;
     private NetworkController mNetworkController;
-    private WifiManager mWifiManager;
     private Context mContext;
     private String formattedInfo;
 
     public DataUsageView(Context context, AttributeSet attrs) {
         super(context, attrs);
         mContext = context;
         mNetworkController = Dependency.get(NetworkController.class);
-        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
         mConnectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
     }
 
@@ -67,16 +62,9 @@ private void updateUsageData() {
         String prefix;
         String suffix;
         if (isWifiConnected()) {
-            final NetworkTemplate template;
-            final WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
-            if (wifiInfo.getHiddenSSID() || wifiInfo.getSSID() == WifiManager.UNKNOWN_SSID) {
-                template = NetworkTemplate.buildTemplateWifiWildcard();
-            } else {
-                template = NetworkTemplate.buildTemplateWifi(wifiInfo.getSSID());
-            }
-            info = dataController.getDataUsageInfo(template);
+            info = showDailyDataUsage ? dataController.getDailyDataUsageInfo()
+                    : dataController.getWifiDataUsageInfo();
             prefix = mContext.getResources().getString(R.string.usage_wifi_prefix);
-            suffix = mContext.getResources().getString(R.string.usage_data);
         } else {
             dataController.setSubscriptionId(SubscriptionManager.getDefaultDataSubscriptionId());
             info = showDailyDataUsage ? dataController.getDailyDataUsageInfo()