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

Commit f5e3df81 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename fsi_boot to dex_boot and the flag names"

parents 283d09ad 51c44036

api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -5859,10 +5859,10 @@ package android.provider { 
    field public static final String NAMESPACE = "content_capture";

  }













  public static interface DeviceConfig.FsiBoot {













    field public static final String NAMESPACE = "fsi_boot";













    field public static final String OOB_ENABLED = "oob_enabled";













    field public static final String OOB_WHITELIST = "oob_whitelist";













  public static interface DeviceConfig.DexBoot {













    field public static final String NAMESPACE = "dex_boot";













    field public static final String PRIV_APPS_OOB_ENABLED = "priv_apps_oob_enabled";













    field public static final String PRIV_APPS_OOB_WHITELIST = "priv_apps_oob_whitelist";















  }





























  public static interface DeviceConfig.IntelligenceAttention {

































core/java/android/provider/DeviceConfig.java



+5
−6




























Original line number
Diff line number
Diff line








@@ -218,16 +218,15 @@ public final class DeviceConfig {













    }































    /**













     * Namespace for Full Stack Integrity to run privileged apps only in JIT mode. The flag applies













     * at process start, so reboot is a way to bring the device to a clean state.













     * Namespace for how dex runs.  The feature may requires reboot to a clean state.















     *















     * @hide















     */















    @SystemApi













    public interface FsiBoot {













        String NAMESPACE = "fsi_boot";













        String OOB_ENABLED = "oob_enabled";













        String OOB_WHITELIST = "oob_whitelist";













    public interface DexBoot {













        String NAMESPACE = "dex_boot";













        String PRIV_APPS_OOB_ENABLED = "priv_apps_oob_enabled";













        String PRIV_APPS_OOB_WHITELIST = "priv_apps_oob_whitelist";















    }































    /**

































services/core/java/com/android/server/pm/dex/DexManager.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -16,7 +16,7 @@





























package com.android.server.pm.dex;





























import static android.provider.DeviceConfig.FsiBoot;













import static android.provider.DeviceConfig.DexBoot;































import static com.android.server.pm.InstructionSets.getAppDexInstructionSets;















import static com.android.server.pm.dex.PackageDexUsage.DexUseInfo;










@@ -710,8 +710,8 @@ public class DexManager {













        return isPackageSelectedToRunOobInternal(















                SystemProperties.getBoolean(PROPERTY_NAME_PM_DEXOPT_PRIV_APPS_OOB, false),















                SystemProperties.get(PROPERTY_NAME_PM_DEXOPT_PRIV_APPS_OOB_LIST, "ALL"),













                DeviceConfig.getProperty(FsiBoot.NAMESPACE, FsiBoot.OOB_ENABLED),













                DeviceConfig.getProperty(FsiBoot.NAMESPACE, FsiBoot.OOB_WHITELIST),













                DeviceConfig.getProperty(DexBoot.NAMESPACE, DexBoot.PRIV_APPS_OOB_ENABLED),













                DeviceConfig.getProperty(DexBoot.NAMESPACE, DexBoot.PRIV_APPS_OOB_WHITELIST),















                packageNamesInSameProcess);















    }