am b4157a43: Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread

Merge commit 'b4157a432cf791906d5b2f6d187f1767357a51bb' into gingerbread-plus-aosp

* commit 'b4157a432cf791906d5b2f6d187f1767357a51bb':
  StrictMode: fix docs to actually compile and add a utility method.

2 files changed, 30 insertions, 1 deletions

diff --git a/api/current.xml b/api/current.xml
index fc54c770a973..a2eae01db01a 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -133740,6 +133740,17 @@
  visibility="public"
 >
 </method>
+<method name="enableDefaults"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getThreadPolicy"
  return="android.os.StrictMode.ThreadPolicy"
  abstract="false"
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java
index de5b7b9c5f89..e9120891b73d 100644
--- a/core/java/android/os/StrictMode.java
+++ b/core/java/android/os/StrictMode.java
@@ -66,7 +66,7 @@ import java.util.HashMap;
  *                 .penaltyLog()
  *                 .build());
  *         StrictMode.setVmPolicy(new {@link VmPolicy.Builder StrictMode.VmPolicy.Builder}()
- *                 .detectLeakedSqlLiteCursors()
+ *                 .detectLeakedSqlLiteObjects()
  *                 .penaltyLog()
  *                 .penaltyDeath()
  *                 .build());
@@ -962,6 +962,24 @@ public final class StrictMode {
     }
 
     /**
+     * Enable the recommended StrictMode defaults, with violations just being logged.
+     *
+     * <p>This catches disk and network access on the main thread, as
+     * well as leaked SQLite cursors.  This is simply a wrapper around
+     * {@link #setVmPolicy} and {@link #setThreadPolicy}.
+     */
+    public static void enableDefaults() {
+        StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
+                                   .detectAll()
+                                   .penaltyLog()
+                                   .build());
+        StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
+                               .detectLeakedSqlLiteObjects()
+                               .penaltyLog()
+                               .build());
+    }
+
+    /**
      * @hide
      */
     public static boolean vmSqliteObjectLeaksEnabled() {