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

Commit 84bf6b80 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive 

This is a temporary hack while we sort out the larger issues.

Test: make & flash
Bug: 68755013

Change-Id: I39f2e7f2e39f4d886ea5fa3d91648404347485ef
parent 80c3c709

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

+10 −1
Original line number Diff line number Diff line
@@ -47,7 +47,16 @@ 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 sysPropValue = SystemProperties.get(getSystemPropertyName(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);

        }

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

                !DexFile.isValidCompilerFilter(sysPropValue)) {

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