From d5a44707dba5fdcf5fe86a1ef63df9ade3633aad Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 10 May 2017 18:53:02 -0700 Subject: [PATCH] Zygote: Allow arbitrary-length wrap property names The restriction on system property key length has been lifted. Update the invoke-with code to first check the full-length property. Then fall back to the truncated version for backwards-compatibility. Bug: 37276041 Test: m Test: manual with long package name (Maps) (cherry picked from commit 4c88a8c6848609333fa6058fcfc22ac58ed94dac) Change-Id: Ic27a26a676f7ac5a998a9bea14259725e89b7e37 --- core/java/com/android/internal/os/ZygoteConnection.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java index a9bec4123fd2a..2013ac09d8e28 100644 --- a/core/java/com/android/internal/os/ZygoteConnection.java +++ b/core/java/com/android/internal/os/ZygoteConnection.java @@ -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;