Merge "Zygote: Allow arbitrary-length wrap property names" am: 11780f1ad3 am: c942ae61e9

am: 85c5e1c123

Change-Id: Id599b6c108b656932343209eb29abb3837b15624
This commit is contained in:
Andreas Gampe
2017-05-16 21:19:16 +00:00
committed by android-build-merger

View File

@@ -762,14 +762,6 @@ class ZygoteConnection {
public static void applyInvokeWithSystemProperty(Arguments args) {
if (args.invokeWith == null && args.niceName != null) {
String property = "wrap." + args.niceName;
if (property.length() > 31) {
// Properties with a trailing "." are illegal.
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) {
args.invokeWith = null;