Merge "Add native boot flag namespace for activity_manager"

diff --cc api/system-current.txt
Simple merge

diff --cc core/java/android/provider/DeviceConfig.java
index f8c355b,784f5c8..30c0731
--- 1/core/java/android/provider/DeviceConfig.java
--- 2/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@@ -137,29 -102,21 +137,41 @@@ public final class DeviceConfig 
       * @hide
       */
      @SystemApi
 -    public static final String NAMESPACE_NOTIFICATION_ASSISTANT = "notification_assistant";
 +    public interface NotificationAssistant {
 +        String NAMESPACE = "notification_assistant";
 +        /**
 +         * Whether the Notification Assistant should generate replies for notifications.
 +         */
 +        String GENERATE_REPLIES = "generate_replies";
 +        /**
 +         * Whether the Notification Assistant should generate contextual actions for notifications.
 +         */
 +        String GENERATE_ACTIONS = "generate_actions";
 +    }
 +
 +    /**
 +     * Namespace for all runtime native related features.
 +     *
 +     * @hide
 +     */
 +    @SystemApi
 +    public interface RuntimeNative {
 +        String NAMESPACE = "runtime_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.
       *
       * @hide

diff --cc services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index 5c60900,bac8204..e731f34
--- 1/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
--- 2/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
+++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
@@@ -77,9 -77,9 +77,10 @@@ class SettingsToPropertiesMapper 
      // permission in the corresponding .te file your feature belongs to.
      @VisibleForTesting
      static final String[] sDeviceConfigScopes = new String[] {
+         DeviceConfig.ActivityManagerNativeBoot.NAMESPACE,
          DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,
          DeviceConfig.NAMESPACE_NETD_NATIVE,
 +        DeviceConfig.RuntimeNative.NAMESPACE,
      };
  
      private final String[] mGlobalSettings;