Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c942ae61 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Zygote: Allow arbitrary-length wrap property names" 

am: 11780f1a

Change-Id: Id1454ecd597347d5fca5f06a17df26e7303c59db
parents 7e80b882 11780f1a

core/java/com/android/internal/os/ZygoteConnection.java

+0 −8
Original line number Diff line number Diff line
@@ -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;