Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread (b4157a43) · Commits · e / os / android_frameworks_base

api/current.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -131667,6 +131667,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"

+19 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ import java.util.HashMap;
		* .penaltyLog()
		* .build());
		* StrictMode.setVmPolicy(new {@link VmPolicy.Builder StrictMode.VmPolicy.Builder}()
		* .detectLeakedSqlLiteCursors()
		* .detectLeakedSqlLiteObjects()
		* .penaltyLog()
		* .penaltyDeath()
		* .build());
		@@ -961,6 +961,24 @@ public final class StrictMode {
		return new VmPolicy(sVmPolicyMask);
		}

		/**
		* 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
		*/