summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2017-05-10 18:53:02 -0700
committer Christopher Ferris <cferris@google.com> 2017-05-24 11:26:18 -0700
commitd5a44707dba5fdcf5fe86a1ef63df9ade3633aad (patch)
treefacf2cceff4acf08ef55595f9bb8ca7302a8e888
parent499c78c0230bc855a581fe011bafcf8048cf1b62 (diff)
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
-rw-r--r--core/java/com/android/internal/os/ZygoteConnection.java8
1 files changed, 0 insertions, 8 deletions
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java
index a9bec4123fd2..2013ac09d8e2 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;