Lazily instantiate LauncherAppState.

The application context for LauncherAppState is supplied by
the application whenever it starts; don't ask for an
instance before that.

Change-Id: I1ca8ea04238a357a682f79250f08813ead7ae532

1 files changed, 29 insertions, 29 deletions

diff --git a/src/com/android/launcher3/WeightWatcher.java b/src/com/android/launcher3/WeightWatcher.java
index 410856a63..5a682dda8 100644
--- a/src/com/android/launcher3/WeightWatcher.java
+++ b/src/com/android/launcher3/WeightWatcher.java
@@ -130,35 +130,6 @@ public class WeightWatcher extends LinearLayout {
         mHandler.sendEmptyMessage(MSG_STOP);
     }
 
-    public String getUptimeString() {
-        long sec = LauncherAppState.getInstance().getUptime() / 1000;
-        StringBuilder sb = new StringBuilder();
-        long days = sec / 86400;
-        if (days > 0) {
-            sec -= days * 86400;
-            sb.append(days);
-            sb.append("d");
-        }
-
-        long hours = sec / 3600;
-        if (hours > 0) {
-            sec -= hours * 3600;
-            sb.append(hours);
-            sb.append("h");
-        }
-
-        long mins = sec / 60;
-        if (mins > 0) {
-            sec -= mins * 60;
-            sb.append(mins);
-            sb.append("m");
-        }
-
-        sb.append(sec);
-        sb.append("s");
-        return sb.toString();
-    }
-
     public class ProcessWatcher extends LinearLayout {
         GraphView mRamGraph;
         TextView mText;
@@ -210,6 +181,35 @@ public class WeightWatcher extends LinearLayout {
             return mPid;
         }
 
+        public String getUptimeString() {
+            long sec = mMemInfo.getUptime() / 1000;
+            StringBuilder sb = new StringBuilder();
+            long days = sec / 86400;
+            if (days > 0) {
+                sec -= days * 86400;
+                sb.append(days);
+                sb.append("d");
+            }
+
+            long hours = sec / 3600;
+            if (hours > 0) {
+                sec -= hours * 3600;
+                sb.append(hours);
+                sb.append("h");
+            }
+
+            long mins = sec / 60;
+            if (mins > 0) {
+                sec -= mins * 60;
+                sb.append(mins);
+                sb.append("m");
+            }
+
+            sb.append(sec);
+            sb.append("s");
+            return sb.toString();
+        }
+
         public void update() {
             //Log.v("WeightWatcher.ProcessWatcher",
             //        "MSG_UPDATE pss=" + mMemInfo.currentPss);