diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-16 14:16:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 14:16:59 +0000 |
| commit | 2488c0ad505846f7655a7434006edea4515b02d0 (patch) | |
| tree | 308cf86e3fa032f71405c3676e147605f8a81f08 | |
| parent | 4be433dc0b817fd4129e2bd99edb4c484f980600 (diff) | |
| parent | 27d3e79031081ab131d5bc4680b80e46a466db53 (diff) | |
| download | frameworks_base-2488c0ad505846f7655a7434006edea4515b02d0.zip frameworks_base-2488c0ad505846f7655a7434006edea4515b02d0.tar.gz frameworks_base-2488c0ad505846f7655a7434006edea4515b02d0.tar.bz2 | |
am 27d3e790: am 706f6cf3: Merge "Fix a property name that\'s longer than 31 chars."
* commit '27d3e79031081ab131d5bc4680b80e46a466db53':
Fix a property name that's longer than 31 chars.
| -rw-r--r-- | core/java/android/os/StrictMode.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java index 55ae986..5018711 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; |