Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94950d33 authored Jun 29, 2023 by Roshan Pius Committed by Automerger Merge Worker Jun 29, 2023

Merge "package-manager: Unhide FEATURE_UWB" am: 8c8901b5

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>

parents 97bf3c58 8c8901b5

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -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";

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -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";