Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"

Jean-Baptiste Queru · android code review · commit 6fb8fe9aba75 · 2012-08-08T12:06:26.000-07:00
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java
@@ -407,17 +407,17 @@ public Builder permitDiskReads() {
             }
 
             /**
-             * Enable detection of disk reads.
+             * Enable detection of slow calls.
              */
             public Builder detectCustomSlowCalls() {
                 return enable(DETECT_CUSTOM);
             }
 
             /**
-             * Enable detection of disk reads.
+             * Disable detection of slow calls.
              */
             public Builder permitCustomSlowCalls() {
-                return enable(DETECT_CUSTOM);
+                return disable(DETECT_CUSTOM);
             }
 
             /**

Original file line number	Diff line number	Diff line change
`@@ -407,17 +407,17 @@ public Builder permitDiskReads() {`
`407`	`407`	`}`
`408`	`408`
`409`	`409`	`/**`
`410`		`- * Enable detection of disk reads.`
	`410`	`+ * Enable detection of slow calls.`
`411`	`411`	`*/`
`412`	`412`	`public Builder detectCustomSlowCalls() {`
`413`	`413`	`return enable(DETECT_CUSTOM);`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`/**`
`417`		`- * Enable detection of disk reads.`
	`417`	`+ * Disable detection of slow calls.`
`418`	`418`	`*/`
`419`	`419`	`public Builder permitCustomSlowCalls() {`
`420`		`- return enable(DETECT_CUSTOM);`
	`420`	`+ return disable(DETECT_CUSTOM);`
`421`	`421`	`}`
`422`	`422`
`423`	`423`	`/**`