From cfa39d269bf404f6121889ebc431fbf20a79eb2a Mon Sep 17 00:00:00 2001
From: John Spurlock <jspurlock@google.com>
Date: Wed, 9 Jul 2014 14:26:00 -0400
Subject: [PATCH] Defer opening a stats session until first use.

Bug:16174801
Change-Id: Ia70f9a01bd348809db4ab2992e5e1265778cfcfa
---
 .../policy/MobileDataController.java          | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataController.java
index ac9d807ad9ced..f2dfe05899e74 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataController.java
@@ -63,13 +63,19 @@ public class MobileDataController {
         mStatsService = INetworkStatsService.Stub.asInterface(
                 ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
         mPolicyManager = NetworkPolicyManager.from(mContext);
+    }
 
-        try {
-            mSession = mStatsService.openSession();
-        } catch (RemoteException e) {
-            Log.w(TAG, "Failed to open stats session");
-            mSession = null;
+    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) {
@@ -86,7 +92,8 @@ public class MobileDataController {
         if (subscriberId == null) {
             return warn("no subscriber id");
         }
-        if (mSession == null) {
+        final INetworkStatsSession session = getSession();
+        if (session == null) {
             return warn("no stats session");
         }
         final NetworkTemplate template = NetworkTemplate.buildTemplateMobileAll(subscriberId);