summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-12-13 16:30:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-13 16:30:17 -0800
commit996f41da3ca69844ffeee9f8e9ae7423bf440788 (patch)
tree51350c7b7ccaa9855f0e3d0afbeb5f93e1efa956
parentb019ef61583fe64478c78a833a0340ab30ba0299 (diff)
parent2d5b11aba0fec21e1ce3f358eb0d280b62704899 (diff)
downloadframeworks_base-996f41da3ca69844ffeee9f8e9ae7423bf440788.zip
frameworks_base-996f41da3ca69844ffeee9f8e9ae7423bf440788.tar.gz
frameworks_base-996f41da3ca69844ffeee9f8e9ae7423bf440788.tar.bz2
am 2d5b11ab: am 0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
* commit '2d5b11aba0fec21e1ce3f358eb0d280b62704899': Fix StrictMode javadoc copy/paste error.
-rw-r--r--core/java/android/os/StrictMode.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java
index ba97dcf..b00b9c9 100644
--- a/core/java/android/os/StrictMode.java
+++ b/core/java/android/os/StrictMode.java
@@ -274,7 +274,7 @@ public final class StrictMode {
}
/**
- * Creates ThreadPolicy instances. Methods whose names start
+ * Creates {@link ThreadPolicy} instances. Methods whose names start
* with {@code detect} specify what problems we should look
* for. Methods whose names start with {@code penalty} specify what
* we should do when we detect a problem.
@@ -285,11 +285,11 @@ public final class StrictMode {
*
* <p>For example, detect everything and log anything that's found:
* <pre>
- * StrictMode.VmPolicy policy = new StrictMode.VmPolicy.Builder()
+ * StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder()
* .detectAll()
* .penaltyLog()
* .build();
- * StrictMode.setVmPolicy(policy);
+ * StrictMode.setThreadPolicy(policy);
* </pre>
*/
public static final class Builder {