Merge "Remove interface for dex_boot." (5bb71f49) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −6

Original line number	Diff line number	Diff line
		@@ -5865,6 +5865,7 @@ package android.provider {
		field public static final String NAMESPACE_AUTOFILL = "autofill";
		field public static final String NAMESPACE_CONNECTIVITY = "connectivity";
		field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture";
		field public static final String NAMESPACE_DEX_BOOT = "dex_boot";
		field public static final String NAMESPACE_GAME_DRIVER = "game_driver";
		field public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot";
		field public static final String NAMESPACE_MEDIA_NATIVE = "media_native";
		@@ -5880,12 +5881,6 @@ package android.provider {
		field public static final String SERVICE_ENABLED = "service_enabled";
		}

		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 {
		field public static final String ATTENTION_ENABLED = "attention_enabled";
		field public static final String ATTENTION_SETTINGS = "attention_settings";

+8 −12

Original line number	Diff line number	Diff line
		@@ -104,6 +104,14 @@ public final class DeviceConfig {
		@TestApi
		public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture";

		/**
		* Namespace for how dex runs. The feature requires a reboot to reach a clean state.
		*
		* @hide
		*/
		@SystemApi
		public static final String NAMESPACE_DEX_BOOT = "dex_boot";

		/**
		* Namespace for all Game Driver features.
		*
		@@ -289,18 +297,6 @@ public final class DeviceConfig {
		String RAMPING_RINGER_VIBRATION_DURATION = "ramping_ringer_vibration_duration";
		}

		/**
		* Namespace for how dex runs. The feature may requires reboot to a clean state.
		*
		* @hide
		*/
		@SystemApi
		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";
		}

		/**
		* Namespace for {@link AttentionManagerService} related features.
		*

+7 −3

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		package com.android.server.pm.dex;

		import static android.provider.DeviceConfig.DexBoot;
		import static android.provider.DeviceConfig.NAMESPACE_DEX_BOOT;

		import static com.android.server.pm.InstructionSets.getAppDexInstructionSets;
		import static com.android.server.pm.dex.PackageDexUsage.DexUseInfo;
		@@ -72,6 +72,10 @@ public class DexManager {
		private static final String PROPERTY_NAME_PM_DEXOPT_PRIV_APPS_OOB_LIST =
		"pm.dexopt.priv-apps-oob-list";

		// flags for Device Config API
		private static final String PRIV_APPS_OOB_ENABLED = "priv_apps_oob_enabled";
		private static final String PRIV_APPS_OOB_WHITELIST = "priv_apps_oob_whitelist";

		private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

		private final Context mContext;
		@@ -713,8 +717,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(DexBoot.NAMESPACE, DexBoot.PRIV_APPS_OOB_ENABLED),
		DeviceConfig.getProperty(DexBoot.NAMESPACE, DexBoot.PRIV_APPS_OOB_WHITELIST),
		DeviceConfig.getProperty(NAMESPACE_DEX_BOOT, PRIV_APPS_OOB_ENABLED),
		DeviceConfig.getProperty(NAMESPACE_DEX_BOOT, PRIV_APPS_OOB_WHITELIST),
		packageNamesInSameProcess);
		}