am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"

* commit '6fb8fe9aba75681509d84f68d536ed78d292bd44':
  StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
This commit is contained in:
Jean-Baptiste Queru
2012-08-08 13:08:27 -07:00
committed by Android Git Automerger

View File

@@ -407,17 +407,17 @@ public final class StrictMode {
}
/**
* 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);
}
/**