| commit | de45035ac1c26ae2346de1c44f79ebfd8e35223c | [log] [tgz] |
|---|---|---|
| author | Feiyu Chen <[email protected]> | Thu Apr 06 16:46:29 2023 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Thu Apr 06 16:46:29 2023 +0000 |
| tree | a3db0684e103f3d401f4019440b274c59ca43424 | |
| parent | e7b7faf0638d18ad1a3a8ca1c216cd374a59a812 [diff] | |
| parent | b069b904ddac06e9735cfadbe716e77fdded9889 [diff] |
Merge "Write edgetpu_native configs to system properties [1/2]" into udc-dev am: b069b904dd Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/ConfigInfrastructure/+/22363340 Change-Id: I44d340ef99a6241bce552b0d5beefab46d337f5e Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/framework/api/system-current.txt b/framework/api/system-current.txt index 59d66ea..cfe7cf7 100644 --- a/framework/api/system-current.txt +++ b/framework/api/system-current.txt
@@ -49,6 +49,7 @@ field public static final String NAMESPACE_CREDENTIAL = "credential_manager"; field @Deprecated public static final String NAMESPACE_DEX_BOOT = "dex_boot"; field public static final String NAMESPACE_DISPLAY_MANAGER = "display_manager"; + field public static final String NAMESPACE_EDGETPU_NATIVE = "edgetpu_native"; field public static final String NAMESPACE_GAME_DRIVER = "game_driver"; field public static final String NAMESPACE_HDMI_CONTROL = "hdmi_control"; field public static final String NAMESPACE_HEALTH_FITNESS = "health_fitness";
diff --git a/framework/java/android/provider/DeviceConfig.java b/framework/java/android/provider/DeviceConfig.java index 266a0c5..e9254b9 100644 --- a/framework/java/android/provider/DeviceConfig.java +++ b/framework/java/android/provider/DeviceConfig.java
@@ -240,6 +240,14 @@ public static final String NAMESPACE_CAPTIVEPORTALLOGIN = "captive_portal_login"; /** + * Namespace for all EdgeTpu related features. + * + * @hide + */ + @SystemApi + public static final String NAMESPACE_EDGETPU_NATIVE = "edgetpu_native"; + + /** * Namespace for all HealthFitness related features. * * @hide