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

Commit d5a9460f 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 am:... 

Merge "Zygote: Allow arbitrary-length wrap property names" am: 11780f1a am: c942ae61 am: 85c5e1c1
am: 52fe51d8

Change-Id: Iceb651255f6541ff46f7a64092f5f55d27318d2d
parents 45da7141 52fe51d8

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

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