summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-11-16 04:10:26 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-11-16 04:10:26 +0000
commit1abfc04d6716178a157f4779325b8f74fd24e055 (patch)
treecd3d8053e78a4d8e5a778e7b3cee17c8a319541e
parent337cc6f5fca672e047b5c0a16f991868e087b4ef (diff)
parent51c5f7ba66cfc8c5d7fe3e45eaa2deda084f8e41 (diff)
Merge "package-manager: Unhide FEATURE_UWB"
-rw-r--r--core/api/current.txt1
-rw-r--r--core/java/android/content/pm/PackageManager.java1
2 files changed, 1 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index ee04a461eff5..6a875b83674c 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -12145,6 +12145,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 207d25c9d398..6c1d84be6c9f 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -3420,7 +3420,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";