am e7a69cbf: am dbd03924: Merge "Fix wrap property creation when truncating."

* commit 'e7a69cbf920565b4b428459198fd53f193080796':
  Fix wrap property creation when truncating.
This commit is contained in:
Christopher Ferris
2015-01-30 00:14:17 +00:00
committed by Android Git Automerger

View File

@@ -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) {