Merge "Remove interfaces for namespaces used in native code." (782a75a6) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −13

Original line number	Diff line number	Diff line
		@@ -5851,19 +5851,17 @@ package android.provider {
		method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static void resetToDefaults(int, @Nullable String);
		method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static boolean setProperty(String, String, String, boolean);
		field public static final String NAMESPACE_ACTIVITY_MANAGER = "activity_manager";
		field public static final String NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT = "activity_manager_native_boot";
		field public static final String NAMESPACE_AUTOFILL = "autofill";
		field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture";
		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";
		field public static final String NAMESPACE_NETD_NATIVE = "netd_native";
		field public static final String NAMESPACE_RUNTIME_NATIVE_BOOT = "runtime_native_boot";
		field public static final String NAMESPACE_SYSTEMUI = "systemui";
		}

		public static interface DeviceConfig.ActivityManagerNativeBoot {
		field public static final String NAMESPACE = "activity_manager_native_boot";
		field public static final String OFFLOAD_QUEUE_ENABLED = "offload_queue_enabled";
		}

		public static interface DeviceConfig.AttentionManagerService {
		field public static final String COMPONENT_NAME = "component_name";
		field public static final String NAMESPACE = "attention_manager_service";
		@@ -5882,10 +5880,6 @@ package android.provider {
		field public static final String NAMESPACE = "intelligence_attention";
		}

		public static interface DeviceConfig.MediaNative {
		field public static final String NAMESPACE = "media_native";
		}

		public static interface DeviceConfig.OnPropertyChangedListener {
		method public void onPropertyChanged(String, String, String);
		}
		@@ -5912,10 +5906,6 @@ package android.provider {
		field public static final String NAMESPACE = "runtime_native";
		}

		public static interface DeviceConfig.RuntimeNativeBoot {
		field public static final String NAMESPACE = "runtime_native_boot";
		}

		public static interface DeviceConfig.Scheduler {
		field public static final String ENABLE_FAST_METRICS_COLLECTION = "enable_fast_metrics_collection";
		field public static final String NAMESPACE = "scheduler";

core/java/android/provider/DeviceConfig.java

+29 −36

Original line number	Diff line number	Diff line
		@@ -64,12 +64,14 @@ public final class DeviceConfig {
		public static final String NAMESPACE_ACTIVITY_MANAGER = "activity_manager";

		/**
		* Namespace for all Game Driver features.
		* Namespace for all activity manager related features that are used at the native level.
		* These features are applied at reboot.
		*
		* @hide
		*/
		@SystemApi
		public static final String NAMESPACE_GAME_DRIVER = "game_driver";
		public static final String NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT =
		"activity_manager_native_boot";

		/**
		* Namespace for autofill feature that provides suggestions across all apps when
		@@ -91,6 +93,14 @@ public final class DeviceConfig {
		@TestApi
		public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture";

		/**
		* Namespace for all Game Driver features.
		*
		* @hide
		*/
		@SystemApi
		public static final String NAMESPACE_GAME_DRIVER = "game_driver";

		/**
		* Namespace for all input-related features that are used at the native level.
		* These features are applied at reboot.
		@@ -100,6 +110,14 @@ public final class DeviceConfig {
		@SystemApi
		public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot";

		/**
		* Namespace for all media native related features.
		*
		* @hide
		*/
		@SystemApi
		public static final String NAMESPACE_MEDIA_NATIVE = "media_native";

		/**
		* Namespace for all netd related features.
		*
		@@ -108,6 +126,15 @@ public final class DeviceConfig {
		@SystemApi
		public static final String NAMESPACE_NETD_NATIVE = "netd_native";

		/**
		* Namespace for all runtime native boot related features. Boot in this case refers to the
		* fact that the properties only take affect after rebooting the device.
		*
		* @hide
		*/
		@SystemApi
		public static final String NAMESPACE_RUNTIME_NATIVE_BOOT = "runtime_native_boot";

		/**
		* Namespace for System UI related features.
		*
		@@ -173,40 +200,6 @@ public final class DeviceConfig {
		String USAP_POOL_REFILL_THRESHOLD = "usap_refill_threshold";
		}

		/**
		* Namespace for all runtime native boot related features. Boot in this case refers to the
		* fact that the properties only take affect after rebooting the device.
		*
		* @hide
		*/
		@SystemApi
		public interface RuntimeNativeBoot {
		String NAMESPACE = "runtime_native_boot";
		}

		/**
		* Namespace for all media native related features.
		*
		* @hide
		*/
		@SystemApi
		public interface MediaNative {
		/** The flag namespace for media native features. */
		String NAMESPACE = "media_native";
		}

		/**
		* Namespace for all activity manager related features that are used at the native level.
		* These features are applied at reboot.
		*
		* @hide
		*/
		@SystemApi
		public interface ActivityManagerNativeBoot {
		String NAMESPACE = "activity_manager_native_boot";
		String OFFLOAD_QUEUE_ENABLED = "offload_queue_enabled";
		}

		/**
		* Namespace for attention-based features provided by on-device machine intelligence.
		*

services/core/java/com/android/server/am/SettingsToPropertiesMapper.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -78,11 +78,11 @@ public class SettingsToPropertiesMapper {
		// permission in the corresponding .te file your feature belongs to.
		@VisibleForTesting
		static final String[] sDeviceConfigScopes = new String[] {
		DeviceConfig.ActivityManagerNativeBoot.NAMESPACE,
		DeviceConfig.MediaNative.NAMESPACE,
		DeviceConfig.NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT,
		DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,
		DeviceConfig.NAMESPACE_MEDIA_NATIVE,
		DeviceConfig.NAMESPACE_NETD_NATIVE,
		DeviceConfig.RuntimeNativeBoot.NAMESPACE,
		DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT,
		DeviceConfig.RuntimeNative.NAMESPACE,
		};