diff options
| author | 2025-01-10 08:47:47 -0800 | |
|---|---|---|
| committer | 2025-01-10 08:47:47 -0800 | |
| commit | afc04b2ec5053bafcd00ca49b467a08fce567f2c (patch) | |
| tree | 1e8944bc2b042b5819aab24a97c5103f7b0e54ee /services/java | |
| parent | 5dda0556ad894c7c4ca62bf1397047f2e2fe4324 (diff) | |
| parent | 5124d5842cf5bf5a32776354219db5969ad486c6 (diff) | |
Merge "Revert "[Ranging] Hnadle non-existence of service-ranging.jar gracefully"" into main am: 5124d5842c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3445912
Change-Id: I06b075f85bf6a04389b919fe7efd2db0104e7477
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 d16b94f84e09..7972d9c6fba3 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -3038,13 +3038,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(); } } |