summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2015-01-16 14:23:44 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-01-16 14:23:44 +0000
commitd28f0fee61d28ab3369e9d9a27db9dafbb0a6eb6 (patch)
tree981409e68fb4e5d1a00b3b20726c20b4397927ce
parent2dc53c560bcba5d423eb4f87533897ac34047eee (diff)
parent2488c0ad505846f7655a7434006edea4515b02d0 (diff)
am 2488c0ad: am 27d3e790: am 706f6cf3: Merge "Fix a property name that\'s longer than 31 chars."
* commit '2488c0ad505846f7655a7434006edea4515b02d0': Fix a property name that's longer than 31 chars.
-rw-r--r--core/java/android/os/StrictMode.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java
index afbc4ce02e53..774754b446cc 100644
--- a/core/java/android/os/StrictMode.java
+++ b/core/java/android/os/StrictMode.java
@@ -145,7 +145,7 @@ public final class StrictMode {
* in {@link VmPolicy.Builder#detectAll()}. Apps can still always opt-into
* detection using {@link VmPolicy.Builder#detectCleartextNetwork()}.
*/
- private static final String CLEARTEXT_PROPERTY = "persist.sys.strictmode.cleartext";
+ private static final String CLEARTEXT_PROPERTY = "persist.sys.strictmode.nonssl";
// Only log a duplicate stack trace to the logs every second.
private static final long MIN_LOG_INTERVAL_MS = 1000;