diff options
| author | Feiyu Chen <feiyuchen@google.com> | 2023-04-06 16:46:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-06 16:46:45 +0000 |
| commit | 656085fc231cf48c64a558b56ec96fb0591fcc5e (patch) | |
| tree | a3db0684e103f3d401f4019440b274c59ca43424 | |
| parent | 77233e4c72a5115b124e176b76e78d4f4ff351a5 (diff) | |
| parent | b069b904ddac06e9735cfadbe716e77fdded9889 (diff) | |
| download | ConfigInfrastructure-android14-d2-s5-release.tar.gz | |
Merge "Write edgetpu_native configs to system properties [1/2]" into udc-dev am: b069b904ddandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/ConfigInfrastructure/+/22363340
Change-Id: Id32eede5bc4a263dab7886288e6431e10fe3444b
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 |