From f82bb8b082057e946efd915df387f938c74b6498 Mon Sep 17 00:00:00 2001
From: Matt Pape <mpape@google.com>
Date: Tue, 12 Mar 2019 09:56:28 -0700
Subject: [PATCH] Remove interface for Intelligence_Attention.

Per API council feedback, we are making changes to include only the
namespace in the system API defined in DeviceConfig.java. Strings which
define property names should be defined in code local to the feature
instead.

Bug: 126411407
Test: atest FrameworksCoreTests:DeviceConfigTest

Change-Id: Ia51733a0fcb061e754ea16c8496100fad338b614
---
 api/system-current.txt                       |  7 +-----
 core/java/android/provider/DeviceConfig.java | 24 +++++++-------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 30cc3a58769ab..2279b72d1b1fd 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5868,6 +5868,7 @@ package android.provider {
     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_INTELLIGENCE_ATTENTION = "intelligence_attention";
     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";
@@ -5881,12 +5882,6 @@ package android.provider {
     field public static final String SERVICE_ENABLED = "service_enabled";
   }
 
-  public static interface DeviceConfig.IntelligenceAttention {
-    field public static final String ATTENTION_ENABLED = "attention_enabled";
-    field public static final String ATTENTION_SETTINGS = "attention_settings";
-    field public static final String NAMESPACE = "intelligence_attention";
-  }
-
   public static interface DeviceConfig.OnPropertiesChangedListener {
     method public void onPropertiesChanged(@NonNull android.provider.DeviceConfig.Properties);
   }
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 17fc108780992..f84455ac02edd 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -129,6 +129,14 @@ public final class DeviceConfig {
     @SystemApi
     public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot";
 
+    /**
+     * Namespace for attention-based features provided by on-device machine intelligence.
+     *
+     * @hide
+     */
+    @SystemApi
+    public static final String NAMESPACE_INTELLIGENCE_ATTENTION = "intelligence_attention";
+
     /**
      * Namespace for all media native related features.
      *
@@ -227,22 +235,6 @@ public final class DeviceConfig {
         String USAP_POOL_REFILL_THRESHOLD = "usap_refill_threshold";
     }
 
-    /**
-     * Namespace for attention-based features provided by on-device machine intelligence.
-     *
-     * @hide
-     */
-    @SystemApi
-    public interface IntelligenceAttention {
-        String NAMESPACE = "intelligence_attention";
-
-        /** If {@code true}, enables the attention features. */
-        String ATTENTION_ENABLED = "attention_enabled";
-
-        /** Settings for the attention features. */
-        String ATTENTION_SETTINGS = "attention_settings";
-    }
-
     /**
      * Privacy related properties definitions.
      *