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

Commit b245e1c0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "package: Add a new BLE channel sounding feature flag" into main am:... 

Merge "package: Add a new BLE channel sounding feature flag" into main am: 0c9aa397 am: 896a9064

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3353035



Change-Id: I9f052929e6095b7f85d6e5a58f138d128dce407c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85fac144 896a9064

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -13399,6 +13399,7 @@ package android.content.pm { 
    field public static final String FEATURE_BACKUP = "android.software.backup";

    field public static final String FEATURE_BLUETOOTH = "android.hardware.bluetooth";

    field public static final String FEATURE_BLUETOOTH_LE = "android.hardware.bluetooth_le";

    field @FlaggedApi("com.android.ranging.flags.ranging_cs_enabled") public static final String FEATURE_BLUETOOTH_LE_CHANNEL_SOUNDING = "android.hardware.bluetooth_le.channel_sounding";

    field public static final String FEATURE_CAMERA = "android.hardware.camera";

    field public static final String FEATURE_CAMERA_ANY = "android.hardware.camera.any";

    field public static final String FEATURE_CAMERA_AR = "android.hardware.camera.ar";

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

+10 −0
Original line number Diff line number Diff line
@@ -3198,6 +3198,16 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_BLUETOOTH_LE = "android.hardware.bluetooth_le";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device is capable of ranging with

     * other devices using channel sounding via Bluetooth Low Energy radio.

     */

    @FlaggedApi(com.android.ranging.flags.Flags.FLAG_RANGING_CS_ENABLED)

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_BLUETOOTH_LE_CHANNEL_SOUNDING =

             "android.hardware.bluetooth_le.channel_sounding";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device has a camera facing away

services/java/com/android/server/SystemServer.java

+4 −1
Original line number Diff line number Diff line
@@ -3062,7 +3062,10 @@ public final class SystemServer implements Dumpable { 
        if (com.android.ranging.flags.Flags.rangingStackEnabled()) {

            if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_UWB)

                    || context.getPackageManager().hasSystemFeature(

                            PackageManager.FEATURE_WIFI_RTT)) {

                            PackageManager.FEATURE_WIFI_RTT)

                    || (com.android.ranging.flags.Flags.rangingCsEnabled()

                            && context.getPackageManager().hasSystemFeature(

                                    PackageManager.FEATURE_BLUETOOTH_LE_CHANNEL_SOUNDING))) {

                t.traceBegin("RangingService");

                // TODO: b/375264320 - Remove after RELEASE_RANGING_STACK is ramped to next.

                try {