Merge "Zygote: Allow arbitrary-length wrap property names" am: 11780f1ad3
am: c942ae61e9
Change-Id: I06a030f61b15aae3bb971c5f5666c940592f48e0
This commit is contained in:
@@ -717,14 +717,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;
|
||||
|
||||
Reference in New Issue
Block a user