Merge "restore functionality to 'dumpsys activity' logs" into ub-gmail-ur14-dev

1 files changed, 13 insertions, 0 deletions

diff --git a/src/com/android/mail/ui/AbstractMailActivity.java b/src/com/android/mail/ui/AbstractMailActivity.java
index 3e336a0d0..00d2f5f87 100644
--- a/src/com/android/mail/ui/AbstractMailActivity.java
+++ b/src/com/android/mail/ui/AbstractMailActivity.java
@@ -22,6 +22,9 @@ import android.os.Bundle;
 import android.os.StrictMode;
 import android.support.v7.app.ActionBarActivity;
 
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+
 /**
  * <p>
  * A complete Mail activity instance. This is the toplevel class that creates the views and handles
@@ -86,4 +89,14 @@ public abstract class AbstractMailActivity extends ActionBarActivity implements
     public Context getActivityContext() {
         return this;
     }
+
+    @Override
+    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {
+        super.dump(prefix, fd, writer, args);
+        // Supplementally dump the contents of the OS LoaderManager and FragmentManager.
+        // Both are still possible to use, and the supportlib dump reads from neither.
+        getLoaderManager().dump(prefix, fd, writer, args);
+        getFragmentManager().dump(prefix, fd, writer, args);
+    }
+
 }