diff options
author | Feiyu Chen <feiyuchen@google.com> | 2023-04-06 16:46:29 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-06 16:46:29 +0000 |
commit | de45035ac1c26ae2346de1c44f79ebfd8e35223c (patch) | |
tree | a3db0684e103f3d401f4019440b274c59ca43424 | |
parent | e7b7faf0638d18ad1a3a8ca1c216cd374a59a812 (diff) | |
parent | b069b904ddac06e9735cfadbe716e77fdded9889 (diff) | |
download | ConfigInfrastructure-de45035ac1c26ae2346de1c44f79ebfd8e35223c.tar.gz |
Merge "Write edgetpu_native configs to system properties [1/2]" into udc-dev am: b069b904ddaml_wif_341110010aml_wif_341011010aml_wif_340913010aml_uwb_341111010aml_uwb_341011000aml_tet_341112070aml_tet_341010040aml_tet_340913030aml_swc_341111000aml_swc_341011020aml_swc_340922010aml_sta_341114000aml_sta_341111000aml_sta_341010020aml_sta_340912000aml_sta_340911000aml_sdk_341110080aml_sdk_341110000aml_sdk_341010000aml_sdk_340912010aml_res_341110000aml_res_340912000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010aml_neu_341010080aml_neu_341010000aml_net_341111030aml_net_341014000aml_net_340913000aml_mpr_341111030aml_mpr_341111020aml_mpr_341015090aml_mpr_341015030aml_mpr_340919000aml_med_341111000aml_med_341011000aml_med_340922010aml_ips_340914280aml_ips_340914200aml_ips_340914000aml_ext_341131030aml_ext_341027030aml_doc_341112000aml_doc_341012000aml_doc_340916000aml_con_341110000aml_cbr_341110000aml_cbr_341011000aml_cbr_340914000aml_ase_341113000aml_ase_340913000aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_adb_340912530aml_adb_340912350aml_adb_340912200aml_adb_340912000android14-mainline-adbd-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/ConfigInfrastructure/+/22363340
Change-Id: I44d340ef99a6241bce552b0d5beefab46d337f5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | framework/api/system-current.txt | 1 | ||||
-rw-r--r-- | framework/java/android/provider/DeviceConfig.java | 8 |
2 files changed, 9 insertions, 0 deletions
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 @@ package android.provider { 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 final class DeviceConfig { 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 |