commit 81a5ffe9995e84adb70c7795a439e464a15e81d8
author Frank Li <lifr@google.com> Thu Jan 27 01:38:48 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 27 01:38:48 2022 +0000
tree fc12d0aa27ced6bed280887ecedbf7ff1e4b3a21
parent a32554eb9be941a1cd2169a86b3be818379eff60
parent 0178dc9b59199f35f91cf1b8da713a9cf4ba9018

Merge "[DU06-1]Remove sl4a INetworkStatsSession dependency"

Common/src/com/googlecode/android_scripting/facade/DataUsageController.java

diff --git a/Common/src/com/googlecode/android_scripting/facade/DataUsageController.java b/Common/src/com/googlecode/android_scripting/facade/DataUsageController.java
index db69d7d..6ec89ed 100644
--- a/Common/src/com/googlecode/android_scripting/facade/DataUsageController.java
+++ b/Common/src/com/googlecode/android_scripting/facade/DataUsageController.java
@@ -28,14 +28,10 @@
 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.NetworkStatsHistory;
 import android.net.NetworkTemplate;
-import android.os.RemoteException;
-import android.os.ServiceManager;
 import android.telephony.TelephonyManager;
 import android.text.format.DateUtils;
 import android.util.Log;
@@ -58,10 +54,8 @@
     private final Context mContext;
     private final TelephonyManager mTelephonyManager;
     private final ConnectivityManager mConnectivityManager;
-    private final INetworkStatsService mStatsService;
     private final NetworkPolicyManager mPolicyManager;
 
-    private INetworkStatsSession mSession;
     private Callback mCallback;
     private NetworkNameProvider mNetworkController;
 
@@ -69,8 +63,6 @@
         mContext = context;
         mTelephonyManager = TelephonyManager.from(context);
         mConnectivityManager = ConnectivityManager.from(context);
-        mStatsService = INetworkStatsService.Stub.asInterface(
-                ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
         mPolicyManager = NetworkPolicyManager.from(mContext);
     }
 
@@ -78,19 +70,6 @@
         mNetworkController = networkController;
     }
 
-    private INetworkStatsSession getSession() {
-        if (mSession == null) {
-            try {
-                mSession = mStatsService.openSession();
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed to open stats session", e);
-            } catch (RuntimeException e) {
-                Log.w(TAG, "Failed to open stats session", e);
-            }
-        }
-        return mSession;
-    }
-
     public void setCallback(Callback callback) {
         mCallback = callback;
     }
@@ -169,10 +148,6 @@
      * @return DataUsageInfo: The data usage information.
      */
     public DataUsageInfo getDataUsageInfo(NetworkTemplate template, int uid) {
-        final INetworkStatsSession session = getSession();
-        if (session == null) {
-            return warn("no stats session");
-        }
         final NetworkPolicy policy = findNetworkPolicy(template);
         final long totalBytes;
         final long now = System.currentTimeMillis();