diff options
| author | Christopher Ferris <cferris@google.com> | 2015-01-29 23:51:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 23:51:16 +0000 |
| commit | e7a69cbf920565b4b428459198fd53f193080796 (patch) | |
| tree | f280fe63b54d7fd14428640c26d3405ec304202e | |
| parent | fb696894ee24ffee3135f4bc460afa84f23efaeb (diff) | |
| parent | dbd03924d83ab03e6e8e45d1d041dc8d162180cf (diff) | |
| download | frameworks_base-e7a69cbf920565b4b428459198fd53f193080796.zip frameworks_base-e7a69cbf920565b4b428459198fd53f193080796.tar.gz frameworks_base-e7a69cbf920565b4b428459198fd53f193080796.tar.bz2 | |
am dbd03924: Merge "Fix wrap property creation when truncating."
* commit 'dbd03924d83ab03e6e8e45d1d041dc8d162180cf':
Fix wrap property creation when truncating.
| -rw-r--r-- | core/java/com/android/internal/os/ZygoteConnection.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java index aba4bd0..0eb52cb 100644 --- a/core/java/com/android/internal/os/ZygoteConnection.java +++ b/core/java/com/android/internal/os/ZygoteConnection.java @@ -800,7 +800,12 @@ class ZygoteConnection { if (args.niceName != null) { String property = "wrap." + args.niceName; if (property.length() > 31) { - property = property.substring(0, 31); + // Avoid creating an illegal property name when truncating. + if (property.charAt(30) != '.') { + property = property.substring(0, 31); + } else { + property = property.substring(0, 30); + } } args.invokeWith = SystemProperties.get(property); if (args.invokeWith != null && args.invokeWith.length() == 0) { |