am 706f6cf3: Merge "Fix a property name that\'s longer than 31 chars."

* commit '706f6cf3839cc3e268e108a8e2e1ac0b2a2287a2':
  Fix a property name that's longer than 31 chars.
This commit is contained in:
Narayan Kamath
2015-01-16 14:11:16 +00:00
committed by Android Git Automerger

View File

@@ -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;