diff options
| author | 2025-01-10 09:12:08 -0800 | |
|---|---|---|
| committer | 2025-01-10 09:12:08 -0800 | |
| commit | 7d2c5fbab70cca21fe1126f229730056de0896b6 (patch) | |
| tree | 1909f4127560e002b6a1233da018e1ed9783d9a5 /services/java | |
| parent | 42bf2d018be56693e9dc9c8f0820cb31a6b40319 (diff) | |
| parent | afc04b2ec5053bafcd00ca49b467a08fce567f2c (diff) | |
Merge "Revert "[Ranging] Hnadle non-existence of service-ranging.jar gracefully"" into main am: 5124d5842c am: afc04b2ec5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3445912
Change-Id: Ic3c8aab328fd39ecfe2190b9247a1074eaea28dc
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 | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 8e06ed8cc283..fadab1f8832e 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -3130,13 +3130,8 @@ public final class SystemServer implements Dumpable { && context.getPackageManager().hasSystemFeature( PackageManager.FEATURE_BLUETOOTH_LE))) { t.traceBegin("RangingService"); - // TODO: b/375264320 - Remove after RELEASE_RANGING_STACK is ramped to next. - try { - mSystemServiceManager.startServiceFromJar(RANGING_SERVICE_CLASS, - RANGING_APEX_SERVICE_JAR_PATH); - } catch (Throwable e) { - Slog.d(TAG, "service-ranging.jar not found, not starting RangingService"); - } + mSystemServiceManager.startServiceFromJar(RANGING_SERVICE_CLASS, + RANGING_APEX_SERVICE_JAR_PATH); t.traceEnd(); } } |