diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-16 14:06:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-16 14:06:39 +0000 |
| commit | 706f6cf3839cc3e268e108a8e2e1ac0b2a2287a2 (patch) | |
| tree | 367478143cadb0143f3a4aa07cfb2ca08c059d37 /core/java | |
| parent | f9c04f17882a61b46f7c6e93cf5f31a2f681c130 (diff) | |
| parent | e5515772af844b3d83e87e2747cdde4e6e076802 (diff) | |
| download | frameworks_base-706f6cf3839cc3e268e108a8e2e1ac0b2a2287a2.zip frameworks_base-706f6cf3839cc3e268e108a8e2e1ac0b2a2287a2.tar.gz frameworks_base-706f6cf3839cc3e268e108a8e2e1ac0b2a2287a2.tar.bz2 | |
Merge "Fix a property name that's longer than 31 chars."
Diffstat (limited to 'core/java')
| -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; |