Merge "Fix a property name that's longer than 31 chars."

2015-01-16 14:06:39 +00:00
parent f9c04f1788 e5515772af
commit 706f6cf383
1 changed files with 1 additions and 1 deletions
--- 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;