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

Commit 5583adf1 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive" 

This reverts commit 84bf6b80.

Reason for revert: ART default properties are now in /system.

Bug: 68755013
Change-Id: I8f13fbb3afe91da54afafbafc758df4e194def11
parent 84bf6b80

services/core/java/com/android/server/pm/PackageManagerServiceCompilerMapping.java

+1 −10
Original line number Diff line number Diff line
@@ -47,16 +47,7 @@ public class PackageManagerServiceCompilerMapping { 
    // Load the property for the given reason and check for validity. This will throw an

    // exception in case the reason or value are invalid.

    private static String getAndCheckValidity(int reason) {

        String sysPropName = getSystemPropertyName(reason);

        String sysPropValue;

        // TODO: This is a temporary hack to keep marlin booting on aosp/master while we

        // figure out how to deal with these system properties that currently appear on

        // vendor.

        if ("pm.dexopt.inactive".equals(sysPropName)) {

            sysPropValue = "verify";

        } else {

            sysPropValue = SystemProperties.get(sysPropName);

        }

        String sysPropValue = SystemProperties.get(getSystemPropertyName(reason));

        if (sysPropValue == null || sysPropValue.isEmpty() ||

                !DexFile.isValidCompilerFilter(sysPropValue)) {

            throw new IllegalStateException("Value \"" + sysPropValue +"\" not valid "