Start the memory dumper directly.

Launching it as an activity from within Launcher is
problematic, so we'll just treat it as a special shortcut
and run the dump when the user clicks that shortcut icon.

Change-Id: Ibe9f4adcaff674f5bafa9b0fc58b5a86cf5ceb00

1 files changed, 18 insertions, 5 deletions

diff --git a/src/com/android/launcher3/MemoryDumpActivity.java b/src/com/android/launcher3/MemoryDumpActivity.java
index b437c22e2..37e392881 100644
--- a/src/com/android/launcher3/MemoryDumpActivity.java
+++ b/src/com/android/launcher3/MemoryDumpActivity.java
@@ -133,20 +133,33 @@ public class MemoryDumpActivity extends Activity {
     public void onStart() {
         super.onStart();
 
+        startDump(this, new Runnable() {
+            @Override
+            public void run() {
+                finish();
+            }
+        });
+    }
+
+    public static void startDump(final Context context) {
+        startDump(context, null);
+    }
+
+    public static void startDump(final Context context, final Runnable andThen) {
         final ServiceConnection connection = new ServiceConnection() {
             public void onServiceConnected(ComponentName className, IBinder service) {
                 Log.v(TAG, "service connected, dumping...");
-                dumpHprofAndShare(MemoryDumpActivity.this,
-                        ((MemoryTracker.MemoryTrackerInterface)service).getService());
-                unbindService(this);
-                finish();
+                dumpHprofAndShare(context,
+                        ((MemoryTracker.MemoryTrackerInterface) service).getService());
+                context.unbindService(this);
+                if (andThen != null) andThen.run();
             }
 
             public void onServiceDisconnected(ComponentName className) {
             }
         };
         Log.v(TAG, "attempting to bind to memory tracker");
-        bindService(new Intent(this, MemoryTracker.class),
+        context.bindService(new Intent(context, MemoryTracker.class),
                 connection, Context.BIND_AUTO_CREATE);
     }
 }