diff options
| author | 2024-12-18 15:28:23 -0800 | |
|---|---|---|
| committer | 2024-12-18 15:28:23 -0800 | |
| commit | 03671f89c8a98bf095b0ec10ce9d3165aeeadcac (patch) | |
| tree | 86e2557432d4425b5e10718d14000efdf8bcf844 /services/java | |
| parent | b2a775dfe193dfcc8beaff02974a618748f7def2 (diff) | |
| parent | feeaba772555cc2f47d68296d8adc2f82610765c (diff) | |
Merge "[Ranging] Modify ranging service to start with ble support." into main am: 605167b30f am: feeaba7725
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3422759
Change-Id: I4f695744e1806ccc060b4fe5e2de883dc7efe194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 30a967c5d4e6..f10b7b9a95a4 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -3121,10 +3121,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_AWARE) || (com.android.ranging.flags.Flags.rangingCsEnabled() && context.getPackageManager().hasSystemFeature( - PackageManager.FEATURE_BLUETOOTH_LE_CHANNEL_SOUNDING))) { + PackageManager.FEATURE_BLUETOOTH_LE))) { t.traceBegin("RangingService"); // TODO: b/375264320 - Remove after RELEASE_RANGING_STACK is ramped to next. try { |