diff options
| author | Xin Li <delphij@google.com> | 2022-04-03 06:41:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-04-03 06:41:20 +0000 |
| commit | be28e53132473f2360bc367183c76d7dbbf914a7 (patch) | |
| tree | 1bf951fdbdb47eef3cecb2dae3a71ce0e73be21b /core/java/android/provider/DeviceConfig.java | |
| parent | 9338b2de5643e0beabf5736326da8d578ee88715 (diff) | |
| parent | 4b9118275ba2d97d51c338e7a39d1f30a6678559 (diff) | |
Merge changes from topic "merge_8391262" into stage-aosp-master
* changes:
Fixup OWNERS file merge conflicts.
Merge Android 12 QPR3 ab/8391262
Diffstat (limited to 'core/java/android/provider/DeviceConfig.java')
| -rw-r--r-- | core/java/android/provider/DeviceConfig.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 1777f56691a7..2351c9353730 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -538,6 +538,13 @@ public final class DeviceConfig { public static final String NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT = "window_manager_native_boot"; /** + * Definitions for voice interaction related functions. + * + * @hide + */ + public static final String NAMESPACE_VOICE_INTERACTION = "voice_interaction"; + + /** * List of namespaces which can be read without READ_DEVICE_CONFIG permission * * @hide |