diff options
author | Daniel Sandler <dsandler@android.com> | 2013-06-17 14:25:46 -0400 |
---|---|---|
committer | Daniel Sandler <dsandler@android.com> | 2013-06-17 15:29:22 -0400 |
commit | a127b7ad151dd1ae66d665a073e98984930c3d9d (patch) | |
tree | a48481da3a1fc73b7946b335e45195d6f18ae0d5 /src/com/android/launcher3 | |
parent | 7c4c5108295db764ba091cc0ffd7af335a166449 (diff) | |
download | android_packages_apps_Trebuchet-a127b7ad151dd1ae66d665a073e98984930c3d9d.tar.gz android_packages_apps_Trebuchet-a127b7ad151dd1ae66d665a073e98984930c3d9d.tar.bz2 android_packages_apps_Trebuchet-a127b7ad151dd1ae66d665a073e98984930c3d9d.zip |
New icon to dump heap information and share it.
Alternatively,
$ adb shell am start -n <pkg>/com.android.launcher3.MemoryDumpActivity
Change-Id: I8c615ec3abffaf6ad693c93bdf569550d8f97298
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherAppState.java | 10 | ||||
-rw-r--r-- | src/com/android/launcher3/MemoryDumpActivity.java | 66 |
3 files changed, 77 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 7f3c4823c..0253103ea 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1041,7 +1041,7 @@ public class Launcher extends Activity mSearchDropTargetBar.setup(this, dragController); } - if (DEBUG_MEMORY) { + if (getResources().getBoolean(R.bool.debug_memory_enabled)) { Log.v(TAG, "adding WeightWatcher"); ((FrameLayout) mLauncherView).addView(new WeightWatcher(this), new FrameLayout.LayoutParams( diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java index fa1670c3b..e7aa3d8ea 100644 --- a/src/com/android/launcher3/LauncherAppState.java +++ b/src/com/android/launcher3/LauncherAppState.java @@ -23,9 +23,15 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.res.Configuration; import android.database.ContentObserver; +import android.net.Uri; +import android.os.Debug; +import android.os.Environment; import android.os.Handler; +import java.io.File; +import java.io.IOException; import java.lang.ref.WeakReference; +import java.util.ArrayList; public class LauncherAppState { private Context mContext; @@ -61,6 +67,10 @@ public class LauncherAppState { mStarttime = System.currentTimeMillis(); + if (context.getResources().getBoolean(R.bool.debug_memory_enabled)) { + WeightWatcher.sUpdateThread.start(); + } + // set sIsScreenXLarge and sScreenDensity *before* creating icon cache sIsScreenLarge = context.getResources().getBoolean(R.bool.is_large_screen); sScreenDensity = context.getResources().getDisplayMetrics().density; diff --git a/src/com/android/launcher3/MemoryDumpActivity.java b/src/com/android/launcher3/MemoryDumpActivity.java new file mode 100644 index 000000000..19b1c4ed1 --- /dev/null +++ b/src/com/android/launcher3/MemoryDumpActivity.java @@ -0,0 +1,66 @@ +package com.android.launcher3; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.os.Debug; +import android.os.Environment; +import android.util.Log; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; + +public class MemoryDumpActivity extends Activity { + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + public static void dumpHprofAndShare(final Context context) { + try { + final String path = String.format("%s/launcher-memory-%d.ahprof", + Environment.getExternalStorageDirectory(), + System.currentTimeMillis()); + Log.v(Launcher.TAG, "Dumping memory info to " + path); + + android.os.Debug.dumpHprofData(path); // will block + + Intent shareIntent = new Intent(Intent.ACTION_SEND); + shareIntent.setType("application/vnd.android.bugreport"); + + final long pss = Debug.getPss(); + final PackageManager pm = context.getPackageManager(); + shareIntent.putExtra(Intent.EXTRA_SUBJECT, String.format("Launcher memory dump (PSS=%d)", pss)); + String appVersion; + try { + appVersion = pm.getPackageInfo(context.getPackageName(), 0).versionName; + } catch (PackageManager.NameNotFoundException e) { + appVersion = "?"; + } + shareIntent.putExtra(Intent.EXTRA_TEXT, String.format("App version: %s\nBuild: %s", + appVersion, Build.DISPLAY)); + shareIntent.setType("application/vnd.android.hprof"); + + //shareIntent.putExtra(Intent.EXTRA_TEXT, android.os.SystemProperties.get("ro.build.description")); + + final File pathFile = new File(path); + final Uri pathUri = Uri.fromFile(pathFile); + + shareIntent.putExtra(Intent.EXTRA_STREAM, pathUri); + context.startActivity(shareIntent); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onStart() { + super.onStart(); + dumpHprofAndShare(this); + finish(); + } +}
\ No newline at end of file |