diff options
| author | Christopher Ferris <cferris@google.com> | 2015-01-30 00:14:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-30 00:14:17 +0000 |
| commit | 0654196fb08fb8c0dfed65ece00f0a4596ed70c2 (patch) | |
| tree | 4bd6cbdb2a8df9bd999bcc53a6759a6cbd2f6e69 | |
| parent | c36d373733b8fb9683d40e404151110ed9c44ecf (diff) | |
| parent | e7a69cbf920565b4b428459198fd53f193080796 (diff) | |
| download | frameworks_base-0654196fb08fb8c0dfed65ece00f0a4596ed70c2.zip frameworks_base-0654196fb08fb8c0dfed65ece00f0a4596ed70c2.tar.gz frameworks_base-0654196fb08fb8c0dfed65ece00f0a4596ed70c2.tar.bz2 | |
am e7a69cbf: am dbd03924: Merge "Fix wrap property creation when truncating."
* commit 'e7a69cbf920565b4b428459198fd53f193080796':
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) { |