diff options
| author | 2023-06-29 20:46:22 +0000 | |
|---|---|---|
| committer | 2023-06-29 20:46:22 +0000 | |
| commit | 94950d33a117d04799665b15d0e68efe08109173 (patch) | |
| tree | 3b81b91bda6b378cac8e3fb696a0afb747e71de0 | |
| parent | 97bf3c581e7ffa3b08adf6152f99eebb98589e1a (diff) | |
| parent | 8c8901b547b409b60887174a50a062e8816d8de7 (diff) | |
Merge "package-manager: Unhide FEATURE_UWB" am: 8c8901b547
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2644445
Change-Id: Ifb24cc703ed84b38ad316a63805aecb2d981a220
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index f15920c813ce..44865b54089d 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -12043,6 +12043,7 @@ package android.content.pm { field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND = "android.hardware.touchscreen.multitouch.jazzhand"; field public static final String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory"; field public static final String FEATURE_USB_HOST = "android.hardware.usb.host"; + field public static final String FEATURE_UWB = "android.hardware.uwb"; field public static final String FEATURE_VERIFIED_BOOT = "android.software.verified_boot"; field public static final String FEATURE_VR_HEADTRACKING = "android.hardware.vr.headtracking"; field @Deprecated public static final String FEATURE_VR_MODE = "android.software.vr.mode"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index bf139bdd300e..4677026a7230 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -3449,7 +3449,6 @@ public abstract class PackageManager { * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device is capable of communicating with * other devices via ultra wideband. - * @hide */ @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_UWB = "android.hardware.uwb"; |