commit 1abfc04d6716178a157f4779325b8f74fd24e055
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 16 04:10:26 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 16 04:10:26 2022 +0000
tree cd3d8053e78a4d8e5a778e7b3cee17c8a319541e
parent 337cc6f5fca672e047b5c0a16f991868e087b4ef
parent 51c5f7ba66cfc8c5d7fe3e45eaa2deda084f8e41

Merge "package-manager: Unhide FEATURE_UWB"

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index ee04a46..6a875b8 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -12145,6 +12145,7 @@
     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";

core/java/android/content/pm/PackageManager.java

diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 207d25c..6c1d84b 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -3420,7 +3420,6 @@
      * 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";